diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index beec78d..955d552 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -5,25 +5,25 @@
 services:
 
   # Coffee Service (coffee.com test)
-  socialbox_coffee:
-    container_name: socialbox_coffee
+  coffee_socialbox:
+    container_name: coffee_socialbox
     build:
       context: .
       dockerfile: Dockerfile
     ports:
       - "8086:8085"
     depends_on:
-      mariadb_coffee:
+      coffee_mariadb:
         condition: service_healthy
-      redis_coffee:
+      coffee_redis:
         condition: service_healthy
     networks:
       - coffee_network
     restart: unless-stopped
     volumes:
-      - ./socialbox_coffee/config:/etc/config
-      - ./socialbox_coffee/logs:/var/log
-      - ./socialbox_coffee/data:/etc/socialbox
+      - ./coffee_socialbox/config:/etc/config
+      - ./coffee_socialbox/logs:/var/log
+      - ./coffee_socialbox/data:/etc/socialbox
     environment:
       # No need to change these values
       LOG_LEVEL: ${LOG_LEVEL:-debug}
@@ -44,13 +44,13 @@ services:
       SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
       SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
       SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
-      SB_DATABASE_HOST: mariadb_coffee
+      SB_DATABASE_HOST: coffee_mariadb
       SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
       SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
       SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
       SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
       SB_CACHE_ENGINE: redis
-      SB_CACHE_HOST: redis_coffee
+      SB_CACHE_HOST: coffee_redis
       SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
       SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
       SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
@@ -59,16 +59,16 @@ services:
       # Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD>
       # Environment Variable name is ignored, only the value is used with the prefix being used to detect
       # the instance name and the suffix being used to detect the TXT record
-      SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-http://127.0.0.1:8086/}
-      SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-http://127.0.0.1:8087/}
+      SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com <txt>"}
+      SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com <txt>"}
     healthcheck:
       test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8086/}"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 40s
-  mariadb_coffee:
-    container_name: socialbox_coffee_mariadb
+  coffee_mariadb:
+    container_name: coffee_socialbox_mariadb
     image: mariadb:10.5
     restart: unless-stopped
     environment:
@@ -83,13 +83,13 @@ services:
     expose:
       - "3306"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "mariadb_coffee", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
+      test: ["CMD", "mysqladmin", "ping", "-h", "coffee_mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
       interval: 10s
       timeout: 5s
       retries: 3
       start_period: 30s
-  redis_coffee:
-    container_name: socialbox_coffee_redis
+  coffee_redis:
+    container_name: coffee_socialbox_redis
     image: redis:alpine
     restart: unless-stopped
     command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes
@@ -108,25 +108,25 @@ services:
       start_period: 5s
 
   # Teapot Service (teapot.com test)
-  socialbox_teapot:
-    container_name: socialbox_teapot
+  teapot_socialbox:
+    container_name: teapot_socialbox
     build:
       context: .
       dockerfile: Dockerfile
     ports:
       - "8087:8085" # Unique port for Teapot instance
     depends_on:
-      mariadb_teapot:
+      teapot_mariadb:
         condition: service_healthy
-      redis_teapot:
+      teapot_redis:
         condition: service_healthy
     networks:
       - teapot_network
     restart: unless-stopped
     volumes:
-      - ./socialbox_teapot/config:/etc/config
-      - ./socialbox_teapot/logs:/var/log
-      - ./socialbox_teapot/data:/etc/socialbox
+      - ./teapot_socialbox/config:/etc/config
+      - ./teapot_socialbox/logs:/var/log
+      - ./teapot_socialbox/data:/etc/socialbox
     environment:
       # No need to change these values
       LOG_LEVEL: ${LOG_LEVEL:-debug}
@@ -147,13 +147,13 @@ services:
       SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
       SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
       SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
-      SB_DATABASE_HOST: mariadb_teapot
+      SB_DATABASE_HOST: teapot_mariadb
       SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
       SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
       SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
       SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
       SB_CACHE_ENGINE: redis
-      SB_CACHE_HOST: redis_teapot
+      SB_CACHE_HOST: teapot_redis
       SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
       SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
       SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
@@ -162,16 +162,16 @@ services:
       # Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD>
       # Environment Variable name is ignored, only the value is used with the prefix being used to detect
       # the instance name and the suffix being used to detect the TXT record
-      SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-http://127.0.0.1:8086/}
-      SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-http://127.0.0.1:8087/}
+      SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com <txt>"}
+      SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com <txt>"}
     healthcheck:
       test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8087/}"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 40s
-  mariadb_teapot:
-    container_name: socialbox_teapot_mariadb
+  teapot_mariadb:
+    container_name: teapot_socialbox_mariadb
     image: mariadb:10.5
     restart: unless-stopped
     environment:
@@ -186,13 +186,13 @@ services:
     expose:
       - "3306"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "mariadb_teapot", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
+      test: ["CMD", "mysqladmin", "ping", "-h", "teapot_mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
       interval: 10s
       timeout: 5s
       retries: 3
       start_period: 30s
-  redis_teapot:
-    container_name: socialbox_teapot_redis
+  teapot_redis:
+    container_name: teapot_socialbox_redis
     image: redis:alpine
     restart: unless-stopped
     command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes