diff --git a/.github/workflows/sf-release.yml b/.github/workflows/sf-release.yml
index 4cc7ee80b5..9fc9673729 100644
--- a/.github/workflows/sf-release.yml
+++ b/.github/workflows/sf-release.yml
@@ -41,21 +41,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate docker tags/labels from github build context
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=tag,prefix=
-            type=sha,prefix=
-            type=sha,prefix=,suffix=-${{ matrix.platform_suffix }}
-            type=edge,branch=firehose-fh3.0,priority=1
-            type=edge,branch=release/*,priority=1
-          flavor: |
-            latest=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') && !contains(github.ref, 'rc') }}
-            prefix=geth-,onlatest=true
-
       - name: Extract version
         id: extract-version
         run: |
@@ -64,22 +49,47 @@ jobs:
             version=${GITHUB_REF#refs/tags/}
           fi
 
-          echo "VERSION=${version} (Commit ${GITHUB_SHA::7}, Commit Date $(git show -s --format=%cI))" >> "$GITHUB_OUTPUT"
+          echo "VERSION=${version}" >> "$GITHUB_OUTPUT"
+
+      - name: Generate docker tags/labels from github build context
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          # The second sha tag is defined to uniquely identify the image and the platform,
+          # we append extract version, either edge or <tag>, this is necessary to avoid a
+          # race condition when pushing a tag and its related branches. In this case, three
+          # build are launched, but only one, the tag, will get it's version set to the tag.
+          #
+          # What happened is that non-tag Docker built image like `3b14725-amd64` was
+          # overwriting the tag Docker image also labeled `3b14725-amd64`. The `push` action
+          # was then merging an image that didn't have the version labels correctly set.
+          #
+          # Our image more looks like `3b14725-edge-amd64` or `3b14725-geth-v1.15.10-fh3.0-amd64`
+          # which mean the `push` can now pick the correct image depending on the type of build.
+          tags: |
+            type=ref,event=tag,prefix=
+            type=sha,prefix=
+            type=sha,prefix=,suffix=-${{ steps.extract-version.outputs.VERSION }}-${{ matrix.platform_suffix }}
+            type=edge,branch=firehose-fh3.0,priority=1
+            type=edge,branch=release/*,priority=1
+          flavor: |
+            latest=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') && !contains(github.ref, 'rc') }}
+            prefix=geth-,onlatest=true
 
       - name: Build and push Docker image (${{ matrix.platform }})
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.sf
           platforms: ${{ matrix.platform }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           provenance: false
+          # FIXME: Switch to Firehose Ethereum!
           build-args: |
-            BUILDNUM=""
-            COMMIT=${{ github.sha }}
-            VERSION=${{ steps.extract-version.outputs.VERSION }}
+            FIREHOSE_CORE=18bb86f
 
   push:
     needs: build
@@ -115,7 +125,12 @@ jobs:
       - name: Extract image
         id: image
         run: |
-            echo "ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+          version="edge"
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            version=${GITHUB_REF#refs/tags/}
+          fi
+
+          echo "ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA::7}-${version}" >> "$GITHUB_OUTPUT"
 
       - name: Create and push manifest images
         uses: Noelware/docker-manifest-action@0.4.3
diff --git a/Dockerfile.sf b/Dockerfile.sf
new file mode 100644
index 0000000000..e7505d379c
--- /dev/null
+++ b/Dockerfile.sf
@@ -0,0 +1,23 @@
+ARG FIREHOSE_CORE="18bb86f"
+
+# Build Geth in a stock Go builder container
+FROM golang:1.24-alpine AS builder
+
+RUN apk add --no-cache gcc musl-dev linux-headers git
+
+# Get dependencies - will also be cached if we won't change go.mod/go.sum
+COPY go.mod /go-ethereum/
+COPY go.sum /go-ethereum/
+RUN cd /go-ethereum && go mod download
+
+ADD . /go-ethereum
+RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
+
+# FIXME: Actually put Firehose Ethereum when it's properly built
+# Pull Geth into Firehose Core container (geth is statically linked, we can copy it from alpine to ubuntu)
+FROM ghcr.io/streamingfast/firehose-core:${FIREHOSE_CORE}
+
+COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/geth
+RUN ln -s /usr/local/bin/geth /app/geth
+
+EXPOSE 8545 8546 30303 30303/udp
\ No newline at end of file