diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index dbb340d..1ee6839 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -43,32 +43,33 @@ services:
     depends_on:
       flyway:
         condition: service_completed_successfully
+    container_name: web3signer
+    restart: always
+    volumes:
+      - "signer_data:/app/web3signer"
     networks:
       dncore_network:
         aliases:
           - web3signer.web3signer-holesky.dappnode
-    restart: always
 
   flyway:
     build:
       context: web3signer/flyway
       dockerfile: Dockerfile
+    container_name: flyway
+    depends_on:
+      postgres:
+        condition: service_started
     networks:
       dncore_network:
         aliases:
           - flyway.web3signer.dappnode
-    depends_on:
-      postgres:
-        condition: service_started
 
   postgres:
     build:
       context: web3signer/postgres
       dockerfile: Dockerfile
-    networks:
-      dncore_network:
-        aliases:
-          - postgres.web3signer.dappnode
+    container_name: postgres
     user: postgres
     healthcheck:
       test: pg_isready -U postgres
@@ -76,17 +77,23 @@ services:
       timeout: 5s
       retries: 5
     restart: always
+    networks:
+      dncore_network:
+        aliases:
+          - postgres.web3signer.dappnode
 
   brain:
     build:
       context: web3signer/brain
       dockerfile: Dockerfile
+    container_name: brain
+    restart: always
+    volumes:
+      - "brain_data:/app/data"
     networks:
       dncore_network:
         aliases:
           - brain.web3signer.dappnode
-    volumes:
-      - "brain_data:/app/data"
 
 networks:
   dncore_network:
@@ -94,5 +101,6 @@ networks:
     external: true
 
 volumes:
+  signer_data: {}
   brain_data: {}
   mongo_data: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index b33a6ac..2591671 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,6 @@ services:
     build:
       context: listener
       dockerfile: Dockerfile
-    ports:
-      - "8080:8080"
     environment:
       MONGO_DB_URI: "mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongo:${MONGO_DB_API_PORT}"
       API_PORT: "${API_PORT}"
@@ -16,10 +14,10 @@ services:
       BEACON_NODE_URL_HOLESKY: ${BEACON_NODE_URL_HOLESKY}
       BEACON_NODE_URL_LUKSO: ${BEACON_NODE_URL_LUKSO}
       BEACON_NODE_URL_GNOSIS: ${BEACON_NODE_URL_GNOSIS}
-
     depends_on:
       - mongo
     container_name: listener
+    restart: always
 
   ui:
     build:
@@ -36,8 +34,7 @@ services:
     depends_on:
       - mongo
     container_name: ui
-    ports:
-      - "8081:8081" # required for mac os access UI
+    restart: always
 
   mongo:
     build:
@@ -49,6 +46,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
     command: ["mongod", "--config", "/etc/mongo/mongod.conf"]
     container_name: mongo
+    restart: always
 
 volumes:
   mongo_data: {}