diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index 7243ce1d0..89accd4e5 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -1,62 +1,63 @@
 version: "3.9"
 services:
   base:
     build: base-image
     image: commapp/services-base:1.0
   # tunnelbroker
   tunnelbroker-base:
     build:
       dockerfile: services/tunnelbroker/docker-base/Dockerfile
       context: ../
     image: commapp/tunnelbroker-base:2.0
   tunnelbroker-server:
     build:
       dockerfile: services/tunnelbroker/docker-server/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
     image: commapp/tunnelbroker-server:0.2
     container_name: tunnelbroker-server
     ports:
       - "${COMM_SERVICES_PORT_TUNNELBROKER}:50051"
     volumes:
+      - $HOME/.aws/config:/root/.aws/config:ro
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
       - ./tunnelbroker/tunnelbroker.ini:/root/tunnelbroker/tunnelbroker.ini:ro
   # backup
   backup-base:
     build:
       dockerfile: services/backup/docker-base/Dockerfile
       context: ../
     image: commapp/backup-base:1.0
   backup-server:
     build:
       dockerfile: services/backup/docker-server/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
         - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
     image: commapp/backup-server:0.1
     container_name: backup-server
     ports:
       - "${COMM_SERVICES_PORT_BACKUP}:50051"
     volumes:
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
   # blob
   blob-base:
     build: 
       dockerfile: services/blob/docker-base/Dockerfile
       context: ../
     image: commapp/blob-base:1.1
   blob-server:
     build: 
       dockerfile: services/blob/docker-server/Dockerfile
       context: ../
       args:
         - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
         - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
     image: commapp/blob-server:0.1
     container_name: blob-server
     ports:
       - "${COMM_SERVICES_PORT_BLOB}:50051"
     volumes:
       - $HOME/.aws/credentials:/root/.aws/credentials:ro
diff --git a/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp b/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp
index a19b2a663..b3b46269b 100644
--- a/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp
+++ b/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp
@@ -1,37 +1,30 @@
 #include "AwsTools.h"
 #include "Constants.h"
 
 namespace comm {
 namespace network {
 
 Aws::String getAwsRegion() {
   auto profileName = Aws::Auth::GetConfigProfileName();
   if (Aws::Config::HasCachedConfigProfile(profileName)) {
     auto profile = Aws::Config::GetCachedConfigProfile(profileName);
     Aws::String profileRegion = profile.GetRegion();
     if (!profileRegion.empty()) {
       return profileRegion;
     }
   }
-  if (Aws::Config::HasCachedCredentialsProfile(profileName)) {
-    auto profile = Aws::Config::GetCachedCredentialsProfile(profileName);
-    Aws::String credRegion = profile.GetRegion();
-    if (!credRegion.empty()) {
-      return credRegion;
-    }
-  }
   return {};
 }
 
 std::unique_ptr<Aws::DynamoDB::DynamoDBClient> getDynamoDBClient() {
   Aws::Client::ClientConfiguration config;
   config.region = getAwsRegion();
   if (config.region.empty()) {
     throw std::runtime_error(
-        "Error: AWS region is not provided in the credentials.");
+        "Error: AWS region is not provided in the ~/.aws/config");
   }
   return std::make_unique<Aws::DynamoDB::DynamoDBClient>(config);
 }
 
 } // namespace network
 } // namespace comm