diff --git a/services/tunnelbroker/src/Tools/ConfigManager.h b/services/tunnelbroker/src/Tools/ConfigManager.h
--- a/services/tunnelbroker/src/Tools/ConfigManager.h
+++ b/services/tunnelbroker/src/Tools/ConfigManager.h
@@ -11,6 +11,7 @@
 class ConfigManager {
 private:
   boost::program_options::variables_map variablesMap;
+  void loadConfigFile(const std::string configFilePath);
 
 public:
   static const std::string OPTION_TUNNELBROKER_ID;
@@ -23,7 +24,7 @@
   static const std::string OPTION_DYNAMODB_MESSAGES_TABLE;
 
   static ConfigManager &getInstance();
-  void load(const std::string configFilePath);
+  void load();
   std::string getParameter(std::string param);
 };
 
diff --git a/services/tunnelbroker/src/Tools/ConfigManager.cpp b/services/tunnelbroker/src/Tools/ConfigManager.cpp
--- a/services/tunnelbroker/src/Tools/ConfigManager.cpp
+++ b/services/tunnelbroker/src/Tools/ConfigManager.cpp
@@ -1,5 +1,6 @@
 #include "ConfigManager.h"
 #include "Constants.h"
+#include "GlobalTools.h"
 
 #include <fstream>
 
@@ -28,7 +29,15 @@
   return instance;
 }
 
-void ConfigManager::load(const std::string configFilePath) {
+void ConfigManager::load() {
+  if (comm::network::tools::isSandbox()) {
+    loadConfigFile(comm::network::DEV_CONFIG_FILE_PATH);
+  } else {
+    loadConfigFile(comm::network::CONFIG_FILE_PATH);
+  }
+}
+
+void ConfigManager::loadConfigFile(const std::string configFilePath) {
   try {
     std::ifstream fileStream;
     fileStream.open(configFilePath.c_str(), std::ifstream::in);
diff --git a/services/tunnelbroker/src/server.cpp b/services/tunnelbroker/src/server.cpp
--- a/services/tunnelbroker/src/server.cpp
+++ b/services/tunnelbroker/src/server.cpp
@@ -41,13 +41,7 @@
 
 int main(int argc, char **argv) {
   comm::network::tools::InitLogging("tunnelbroker");
-  if (comm::network::tools::isSandbox()) {
-    comm::network::config::ConfigManager::getInstance().load(
-        comm::network::DEV_CONFIG_FILE_PATH);
-  } else {
-    comm::network::config::ConfigManager::getInstance().load(
-        comm::network::CONFIG_FILE_PATH);
-  }
+  comm::network::config::ConfigManager::getInstance().load();
   std::thread amqpThread(comm::network::RunAmqpClient);
   std::thread grpcThread(comm::network::RunServer);
   amqpThread.join();