diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7a3d299c1..4a5fb39fc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,10 +24,8 @@ jobs:
         settings:
           - arch: linux/amd64
             runs-on: ubuntu-24.04
-            features: jemalloc,asm-keccak,optimism
           - arch: linux/arm64
             runs-on: ubuntu-24.04-arm
-            features: jemalloc,optimism
     runs-on: ${{ matrix.settings.runs-on }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
@@ -63,8 +61,6 @@ jobs:
           file: Dockerfile
           tags: ${{ env.NAMESPACE }}/${{ env.RETH_IMAGE_NAME }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            FEATURES=${{ matrix.settings.features }}
           platforms: ${{ matrix.settings.arch }}
           outputs: type=image,push-by-digest=true,name-canonical=true,push=true
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 8ddfbfc4a..f7e3eef69 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -14,10 +14,8 @@ jobs:
         settings:
           - arch: linux/amd64
             runs-on: ubuntu-24.04
-            features: jemalloc,asm-keccak,optimism
           - arch: linux/arm64
             runs-on: ubuntu-24.04-arm
-            features: jemalloc,optimism
     runs-on: ${{ matrix.settings.runs-on }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
@@ -39,6 +37,4 @@ jobs:
           context: .
           file: Dockerfile
           push: false
-          build-args: |
-            FEATURES=${{ matrix.settings.features }}
           platforms: ${{ matrix.settings.arch }}
diff --git a/docker-compose.yml b/docker-compose.yml
index c88064344..36078a532 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 services:
   execution:
+    image: base-node:local
     build:
       context: .
       dockerfile: Dockerfile
@@ -16,9 +17,7 @@ services:
     env_file:
       - ${NETWORK_ENV:-.env.mainnet} # Use .env.mainnet by default, override with .env.sepolia for testnet
   node:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: base-node:local
     restart: unless-stopped
     depends_on:
       - execution