diff --git a/docker-compose.yml b/docker-compose.yml
index 98e094288bdadfc040224aaf12b5c202e028840c..298e3a4037c417da9e5a46f7e705d41895138a37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,8 @@ services:
       - '4000:4000'
     environment:
       NATS_URL: nats://nats:4222
+      NATS_USER: nats_user
+      NATS_PASSWORD: Rw+dYIymAQm9H6ELLNwSuGo1812jqQ==
       PORT: 3009
       AGENT_NAME: ssi-abstraction-agent
       AGENT_WALLET_ID: ssi-wallet-id
@@ -43,17 +45,16 @@ services:
         - SERVICE=schema-manager
     init: true
     environment:
-      - HTTP_PORT=3000
-      - NATS_URL=nats://nats:4222
-      - NATS_USER=nats_user
-      - NATS_PASSWORD=Rw+dYIymAQm9H6ELLNwSuGo1812jqQ==
-      - NATS_MONITORING_URL=http://nats:8222
-      - SSI_AGENT_URL=http://ssi:3009
+      HTTP_PORT: 3000
+      NATS_URL: nats://nats:4222
+      NATS_USER: nats_user
+      NATS_PASSWORD: Rw+dYIymAQm9H6ELLNwSuGo1812jqQ==
+      NATS_MONITORING_URL: http://nats:8222
+      SSI_AGENT_URL: http://ssi:3009
     ports:
       - '4001:3000'
     depends_on:
       - nats
-      - ssi
 
   connection-manager:
     build:
@@ -61,15 +62,16 @@ services:
         - SERVICE=connection-manager
     init: true
     environment:
-      - HTTP_PORT=3000
-      - NATS_URL=nats://nats:4222
-      - NATS_MONITORING_URL=http://nats:8222
-      - SSI_AGENT_URL=http://ssi:3009
+      HTTP_PORT: 3000
+      NATS_URL: nats://nats:4222
+      NATS_USER: nats_user
+      NATS_PASSWORD: Rw+dYIymAQm9H6ELLNwSuGo1812jqQ==
+      NATS_MONITORING_URL: http://nats:8222
+      SSI_AGENT_URL: http://ssi:3009
     ports:
       - '4002:3000'
     depends_on:
       - nats
-      - ssi
 
   credential-manager:
     build:
@@ -77,30 +79,32 @@ services:
         - SERVICE=credential-manager
     init: true
     environment:
-      - HTTP_HOST=0.0.0.0
-      - HTTP_PORT=3000
-      - NATS_URL=nats://nats:4222
-      - NATS_MONITORING_URL=http://nats:8222
-      - SSI_AGENT_URL=http://ssi:3009
+      HTTP_HOST: 0.0.0.0
+      HTTP_PORT: 3000
+      NATS_URL: nats://nats:4222
+      NATS_USER: nats_user
+      NATS_PASSWORD: Rw+dYIymAQm9H6ELLNwSuGo1812jqQ==
+      NATS_MONITORING_URL: http://nats:8222
+      SSI_AGENT_URL: http://ssi:3009
     ports:
       - '4003:3000'
     depends_on:
       - nats
-      - ssi
 
-  # proof-manager:
-  #   build:
-  #     args:
-  #       - SERVICE=proof-manager
-  #   init: true
-  #   environment:
-  #     - HTTP_HOST=0.0.0.0
-  #     - HTTP_PORT=3000
-  #     - NATS_URL=nats://nats:4222
-  #     - NATS_MONITORING_URL=http://nats:8222
-  #     - SSI_AGENT_URL=http://ssi:3000
-  #   ports:
-  #     - '4004:3000'
-  #   depends_on:
-  #     - nats
-  #     - ssi
+  proof-manager:
+    build:
+      args:
+        - SERVICE=proof-manager
+    init: true
+    environment:
+      HTTP_HOST: 0.0.0.0
+      HTTP_PORT: 3000
+      NATS_URL: nats://nats:4222
+      NATS_USER: nats_user
+      NATS_PASSWORD: Rw+dYIymAQm9H6ELLNwSuGo1812jqQ==
+      NATS_MONITORING_URL: http://nats:8222
+      SSI_AGENT_URL: http://ssi:3000
+    ports:
+      - '4004:3000'
+    depends_on:
+      - nats