diff --git a/docker-compose.yaml b/docker-compose.yaml
index d727943..d627668 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,37 +1,53 @@
 
 services:
   codex-frontend:
-    image: thatbenbierens/codex-frontend:initial
+    image: codexstorage/codex-frontend:latest
     ports:
       - 3000:80
     environment:
-     - CODEX_URL=urlhere
+     - codex_url=http://my-codex-node:8080
     depends_on:
       - my-codex-node
 
   my-codex-node:
-    image: codexstorage/nim-codex:latest
+    image: codexstorage/nim-codex:latest-dist-tests
     ports:
       - 8080:8080/tcp # API port
       - 8090:8090/udp # Discovery port
       - 8070:8070/tcp # Listen port
     environment:
       - CODEX_LOG_LEVEL=Trace
+      - CODEX_API_PORT=8080
       - CODEX_API_BINDADDR=0.0.0.0
       - CODEX_LISTEN_ADDRS=/ip4/0.0.0.0/tcp/8070
-      - CODEX_BOOTSTRAP_NODE=spr:CiUIAhIhAjWRnAkZNe1RMo5eYtJwQctMX7SECrxwy6qqYmdqDAmUEgIDARo8CicAJQgCEiECNZGcCRk17VEyjl5i0nBBy0xftIQKvHDLqqpiZ2oMCZQQ_bH4qQYaCwoJBJ_f8IKRAk4qKkYwRAIgRHwAKFLPX5fD-FBvOaaAH2wqmJorneiaTvUxLU40Fl8CIGhInG38fafO3ZhqLjg8aice2KTtKdG5HaadD_ciGcLF
-      # - CODEX_PERSISTENCE=true
-      # - CODEX_ETH_PROVIDER=ws://codex-testnet-geth-node:8546
-      # - CODEX_MARKETPLACE_ADDRESS=0x92F09Aa59DcCb892a9f5406DDd9c0b98f02EA57e
-      # - PRIV_KEY=9721fb80cf32275ce80ae41927130adc767d435dbb1d80114dac2ef2d7c951f0
+      - CODEX_DISC_PORT=8090
+      - CODEX_BOOTSTRAP_NODE=spr:CiUIAhIhAlrt4nrtZA6BtsyuUS2lJoZQQaRjItOCvdbNBWAwjpXNEgIDARo8CicAJQgCEiECWu3ieu1kDoG2zK5RLaUmhlBBpGMi04K91s0FYDCOlc0QpunsqgYaCwoJBJ_f5lWRAnVOKkcwRQIhANP3hAuwJpazzbj6kLlB2QNfAMeL6mbaRDBigZHVzJvdAiBuyNcpvulJ7O8D4enYhASY05UfxBLUl0VMHJptwWv6KQ
+      - NAT_PUBLIC_IP_AUTO=https://ip.codex.storage
+      - NAT_IP_AUTO=false
+
+      - CODEX_ETH_PROVIDER=ws://my-geth:8083
+      - CODEX_PERSISTENCE=true
+      - CODEX_VALIDATOR=false
+      - CODEX_MARKETPLACE_ADDRESS=0x92F09Aa59DcCb892a9f5406DDd9c0b98f02EA57e
+
+      - PRIV_KEY=<YOUR-KEY-HERE>
     volumes:
       - ./datadir:/datadir
     depends_on:
-      - codex-testnet-geth-node
+      - my-geth
 
-  codex-testnet-geth-node:
+  my-geth:
     image: codexstorage/dist-tests-geth:latest
-    ports:
-      - 8546:8546
     environment:
-      - GETH_ARGS=--http.addr 0.0.0.0 --http.port 8545 --port 30303 --discovery.port 30303 --bootnodes enode://5db8dc8028481a409c3f7a7bcd138926ada0b8b412f7df51e4fd34f67327a5a9d522367af4c0d4fdbc745b81702f88e1ade6cc50ea54997b7d069a5e6082734d@159.223.240.130:20041 --ipcdisable --syncmode full --authrpc.port 8551 --ws --ws.addr 0.0.0.0 --ws.port 8546
+      - ENABLE_MINER=1
+      - UNLOCK_START_INDEX=0
+      - UNLOCK_NUMBER=1
+      - GETH_ARGS=--http.addr 0.0.0.0 --http.port 30000 --port 8081 --discovery.port 8080 --ipcdisable --syncmode full --authrpc.port 8082 --ws --ws.addr 0.0.0.0 --ws.port 8083
+
+  # Not needed when geth node is bootstrapped.
+  # apply-contracts:
+  #   image: codexstorage/codex-contracts-eth:sha-1854dfb-dist-tests
+  #   environment:
+  #     - DISTTEST_NETWORK_URL=http://my-geth:30000
+  #     - HARDHAT_NETWORK=codexdisttestnetwork
+  #     - KEEP_ALIVE=1