diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7c80a52..b6aed11 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -66,7 +66,7 @@ services:
     entrypoint: /bin/sh
     command: -c '[ -d /data/geth/chaindata ] && echo "Genesis block already created" || geth init --datadir /data /data/genesis.json'
     volumes:
-      - ./geth-data:/data
+      - ./geth-data:/data:z
       - ./genesis.json:/data/genesis.json
     networks:
       - codex
@@ -97,14 +97,15 @@ services:
       - 8547:8547/udp # Discovery
       - 8548:8548/tcp # Transport
     volumes:
-      - ./geth-data:/data
+      - ./geth-data:/data:z
     logging:
       driver: json-file
       options:
         max-size: 100m
         max-file: 5
     depends_on:
-      - geth-init
+      geth-init:
+        condition: service_completed_successfully
     networks:
       - codex