diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4b9c421b..0e115ed2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,9 +3,9 @@ name: Tag Docker image
 on:
   push:
     branches:
-      - 'main'
+      - "main"
     tags:
-      - 'v*'
+      - "v*"
 
 env:
   REGISTRY: ghcr.io
@@ -29,6 +29,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v4
@@ -41,7 +46,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push the Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: geth/Dockerfile
@@ -78,7 +83,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push the Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: reth/Dockerfile
@@ -96,29 +101,29 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-  
+
       - name: Log into the Container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-  
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
           platforms: ${{ matrix.arch }}
-  
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-  
+
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
             ${{ env.NAMESPACE }}/${{ env.NETHERMIND_IMAGE_NAME }}
-  
+
       - name: Build and push the Docker image
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 8900322b..5b0a58ed 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -9,16 +9,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [ linux/amd64, linux/arm64 ]
+        arch: [linux/amd64, linux/arm64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
       - name: Build the Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: geth/Dockerfile
@@ -39,7 +46,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build the Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: reth/Dockerfile
@@ -51,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [ linux/amd64 ]
+        arch: [linux/amd64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -66,4 +73,3 @@ jobs:
           file: nethermind/Dockerfile
           push: false
           platforms: ${{ matrix.arch }}
-
diff --git a/geth/Dockerfile b/geth/Dockerfile
index e162ef34..22e5232a 100644
--- a/geth/Dockerfile
+++ b/geth/Dockerfile
@@ -19,6 +19,10 @@ FROM golang:1.22 AS geth
 
 WORKDIR /app
 
+RUN apt-get update && \
+    apt-get install -y \
+    build-essential
+
 ENV REPO=https://github.com/ethereum-optimism/op-geth.git
 ENV VERSION=v1.101411.6
 ENV COMMIT=50b3422b9ac682a8fa503c4f409339a9bff69717