diff --git a/src/communication/cmconnection.cpp b/src/communication/cmconnection.cpp
index ca8657f..bbc1ffa 100644
--- a/src/communication/cmconnection.cpp
+++ b/src/communication/cmconnection.cpp
@@ -177,6 +177,8 @@ void CMConnection::RunSecureChannel()
 
             mCondVar.wait_for(lock, cConnectionTimeout, [this]() { return mShutdown.load(); });
 
+            LOG_DBG() << "Reconnect CM secure channel";
+
             continue;
         }
 
diff --git a/src/config/config.cpp b/src/config/config.cpp
index f07360f..756142d 100644
--- a/src/config/config.cpp
+++ b/src/config/config.cpp
@@ -63,7 +63,8 @@ IAMConfig ParseIAMConfig(const common::utils::CaseInsensitiveObjectWrapper& obje
 {
     return IAMConfig {
         object.GetValue<std::string>("IAMPublicServerURL"),
-        object.GetValue<std::string>("IAMProtectedServerURL"),
+        object.GetValue<std::string>("IAMMainPublicServerURL"),
+        object.GetValue<std::string>("IAMMainProtectedServerURL"),
         object.GetValue<std::string>("CertStorage"),
         object.GetValue<int>("OpenPort"),
         object.GetValue<int>("SecurePort"),
diff --git a/src/config/config.hpp b/src/config/config.hpp
index 3204cc7..9bba092 100644
--- a/src/config/config.hpp
+++ b/src/config/config.hpp
@@ -45,7 +45,8 @@ struct VChanConfig {
  */
 struct IAMConfig {
     std::string mIAMPublicServerURL;
-    std::string mIAMProtectedServerURL;
+    std::string mIAMMainPublicServerURL;
+    std::string mIAMMainProtectedServerURL;
     std::string mCertStorage;
     int         mOpenPort;
     int         mSecurePort;
diff --git a/src/iamclient/publicnodeclient.cpp b/src/iamclient/publicnodeclient.cpp
index 26107f9..489431b 100644
--- a/src/iamclient/publicnodeclient.cpp
+++ b/src/iamclient/publicnodeclient.cpp
@@ -28,7 +28,7 @@ Error PublicNodeClient::Init(
         return err;
     }
 
-    mUrl = publicServer ? cfg.mIAMPublicServerURL : cfg.mIAMProtectedServerURL;
+    mUrl = publicServer ? cfg.mIAMMainPublicServerURL : cfg.mIAMMainProtectedServerURL;
 
     return ErrorEnum::eNone;
 }
diff --git a/tests/config/config_test.cpp b/tests/config/config_test.cpp
index 649bb5d..109ea14 100644
--- a/tests/config/config_test.cpp
+++ b/tests/config/config_test.cpp
@@ -49,7 +49,8 @@ class ConfigTest : public ::testing::Test {
             "ImageStoreDir": "/path/to/images",
             "IAMConfig": {
                 "IAMPublicServerURL": "localhost:8090",
-                "IAMProtectedServerURL": "localhost:8091",
+                "IAMMainPublicServerURL": "main:8090",
+                "IAMMainProtectedServerURL": "main:8091",
                 "CertStorage": "iam",
                 "OpenPort": 8080,
                 "SecurePort": 8081
@@ -96,7 +97,8 @@ TEST_F(ConfigTest, ParseConfig)
     EXPECT_EQ(config.mImageStoreDir, "/path/to/images");
 
     EXPECT_EQ(config.mIAMConfig.mIAMPublicServerURL, "localhost:8090");
-    EXPECT_EQ(config.mIAMConfig.mIAMProtectedServerURL, "localhost:8091");
+    EXPECT_EQ(config.mIAMConfig.mIAMMainPublicServerURL, "main:8090");
+    EXPECT_EQ(config.mIAMConfig.mIAMMainProtectedServerURL, "main:8091");
     EXPECT_EQ(config.mIAMConfig.mCertStorage, "iam");
     EXPECT_EQ(config.mIAMConfig.mOpenPort, 8080);
     EXPECT_EQ(config.mIAMConfig.mSecurePort, 8081);
diff --git a/tests/iamclient/iamclient_test.cpp b/tests/iamclient/iamclient_test.cpp
index 5ce41cb..6536f70 100644
--- a/tests/iamclient/iamclient_test.cpp
+++ b/tests/iamclient/iamclient_test.cpp
@@ -26,8 +26,9 @@ class IamClientTest : public Test {
 public:
     IamClientTest()
     {
-        mConfig.mIAMConfig.mIAMPublicServerURL    = "localhost:8002";
-        mConfig.mIAMConfig.mIAMProtectedServerURL = "localhost:8002";
+        mConfig.mIAMConfig.mIAMPublicServerURL        = "localhost:8002";
+        mConfig.mIAMConfig.mIAMMainPublicServerURL    = "localhost:8002";
+        mConfig.mIAMConfig.mIAMMainProtectedServerURL = "localhost:8002";
     }
 
 protected: