diff --git a/.env b/.env
index a4f03c05..9c6b1d6d 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-GETH_HOST_DATA_DIR=./geth-data
-RETH_HOST_DATA_DIR=./reth-data
+HOST_DATA_DIR=./geth-data
+CLIENT=geth
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2700f2cc..0de8dd1e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -42,7 +42,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.geth
+          file: geth/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -81,7 +81,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.reth
+          file: reth/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 8ff2e3c1..3b2fc9fc 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -20,7 +20,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.geth
+          file: geth/Dockerfile
           push: false
           platforms: ${{ matrix.arch }}
   reth:
@@ -43,7 +43,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.reth
+          file: reth/Dockerfile
           push: false
           build-args: |
             FEATURES=${{ matrix.features }}
diff --git a/docker-compose-reth.yml b/docker-compose-reth.yml
deleted file mode 100644
index 991f9cdd..00000000
--- a/docker-compose-reth.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-services:
-  execution:
-    build:
-      context: .
-      dockerfile: Dockerfile.reth
-    ports:
-      - "8545:8545"       # RPC
-      - "8546:8546"       # websocket
-      - "7301:6060"       # metrics
-    command: [ "bash", "./execution-entrypoint" ]
-    volumes:
-        - ${RETH_HOST_DATA_DIR}:/data
-    env_file:
-      # select your network here:
-#      - .env.mainnet
-#      - .env.sepolia
-  node:
-    build:
-      context: .
-      dockerfile: Dockerfile.reth
-    depends_on:
-      - execution
-    ports:
-      - "7545:8545"     # RPC
-      - "9222:9222"     # P2P TCP
-      - "9222:9222/udp" # P2P UDP
-      - "7300:7300"     # metrics
-      - "6060:6060"     # pprof
-    command: [ "bash", "./op-node-entrypoint" ]
-    env_file:
-      # select your network here:
-#      - .env.mainnet
-#      - .env.sepolia
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e6e39a3..9068905d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,14 +2,14 @@ services:
   execution:
     build:
       context: .
-      dockerfile: Dockerfile.geth
+      dockerfile: ${CLIENT}/Dockerfile
     ports:
       - "8545:8545"       # RPC
       - "8546:8546"       # websocket
       - "7301:6060"       # metrics
     command: [ "bash", "./execution-entrypoint" ]
     volumes:
-        - ${GETH_HOST_DATA_DIR}:/data
+        - ${HOST_DATA_DIR}:/data
     env_file:
       # select your network here:
 #      - .env.sepolia
@@ -17,7 +17,7 @@ services:
   node:
     build:
       context: .
-      dockerfile: Dockerfile.geth
+      dockerfile: ${CLIENT}/Dockerfile
     depends_on:
       - execution
     ports:
diff --git a/Dockerfile.geth b/geth/Dockerfile
similarity index 96%
rename from Dockerfile.geth
rename to geth/Dockerfile
index 51219d54..fd0c323d 100644
--- a/Dockerfile.geth
+++ b/geth/Dockerfile
@@ -42,7 +42,7 @@ WORKDIR /app
 COPY --from=op /app/op-node/bin/op-node ./
 COPY --from=geth /app/build/bin/geth ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY geth-entrypoint ./execution-entrypoint
+COPY geth/geth-entrypoint ./execution-entrypoint
 COPY op-node-entrypoint .
 
 CMD ["/usr/bin/supervisord"]
diff --git a/geth-entrypoint b/geth/geth-entrypoint
similarity index 100%
rename from geth-entrypoint
rename to geth/geth-entrypoint
diff --git a/Dockerfile.reth b/reth/Dockerfile
similarity index 95%
rename from Dockerfile.reth
rename to reth/Dockerfile
index daff33c0..a98ad7d8 100644
--- a/Dockerfile.reth
+++ b/reth/Dockerfile
@@ -40,7 +40,7 @@ WORKDIR /app
 COPY --from=op /app/op-node/bin/op-node ./
 COPY --from=reth /app/target/maxperf/op-reth ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY reth-entrypoint ./execution-entrypoint
+COPY ./reth/reth-entrypoint ./execution-entrypoint
 COPY op-node-entrypoint .
 
 CMD ["/usr/bin/supervisord"]
diff --git a/reth-entrypoint b/reth/reth-entrypoint
similarity index 97%
rename from reth-entrypoint
rename to reth/reth-entrypoint
index 5cf0608b..91248600 100755
--- a/reth-entrypoint
+++ b/reth/reth-entrypoint
@@ -17,7 +17,6 @@ echo "$OP_NODE_L2_ENGINE_AUTH_RAW" > "$OP_NODE_L2_ENGINE_AUTH"
 
 exec ./op-reth node \
   -vvv \
-  --config /app/reth.toml \
   --datadir="$RETH_DATA_DIR" \
   --log.stdout.format log-fmt \
   --ws \