diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4e29ed9af..9863dcd46 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,4 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @rdkcentral/rdke_ghec_tr69_maintainer @rdkcentral/rdke_ghec_tr69_admin
+*       @rdkcentral/tr69hostif-maintainers
diff --git a/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp b/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp
index d3db9e82f..3783b6549 100644
--- a/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp
+++ b/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp
@@ -82,15 +82,22 @@ bool DSClientReqHandler::init()
 {
     RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__);
     RDK_LOG(RDK_LOG_DEBUG,LOG_TR69HOSTIF,"[%s()] Device manager Initializing\n", __FUNCTION__);
-    try
+    while(true)
     {
-       device::Manager::Initialize();
+       try
+       {
+          device::Manager::Initialize();
+       }
+       catch(const std::exception &e)
+       {
+          RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"Exception thrown while initializing device manager %s\n", e.what());
+          sleep(3);
+          continue;
+       }
+       RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s()] Device manager Initialized success break loop \n", __FUNCTION__);
+       break;
     }
-    catch(const std::exception &e)
-    {
-       RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"Exception thrown while initializing device manager %s\n", e.what());
-    }
-    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Exiting..\n", __FUNCTION__, __FILE__);
+    RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s:%s] Exiting..\n", __FUNCTION__, __FILE__);
     return true;
 }