diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml
index 20888a3229..5c480f8e54 100644
--- a/infrastructure/shared/docker-compose.yml
+++ b/infrastructure/shared/docker-compose.yml
@@ -92,8 +92,8 @@ services:
       AGENT_DB_NAME: agent
       AGENT_DB_USER: postgres
       AGENT_DB_PASSWORD: postgres
-      DIDCOMM_SERVICE_URL: ${DIDCOMM_SERVICE_URL:-http://${DOCKERHOST}:${PORT}/didcomm}
-      REST_SERVICE_URL: ${REST_SERVICE_URL:-http://${DOCKERHOST}:${PORT}/prism-agent}
+      DIDCOMM_SERVICE_URL: ${DIDCOMM_SERVICE_URL:-http://$${DOCKERHOST}:$${PORT}/didcomm}
+      REST_SERVICE_URL: ${REST_SERVICE_URL:-http://$${DOCKERHOST}:$${PORT}/prism-agent}
       PRISM_NODE_HOST: prism-node
       PRISM_NODE_PORT: 50053
       VAULT_ADDR: ${VAULT_ADDR:-http://vault-server:8200}