diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 7752e1349e..7c6ef4c397 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -482,7 +482,7 @@ jobs:
         run: echo "{\"credsStore\":\"ecr-login\"}" > /kaniko/.docker/config.json
 
       - name: Kaniko build compute node with extensions
-        run: /kaniko/executor --snapshotMode=redo --cache=true --cache-repo 369495373322.dkr.ecr.eu-central-1.amazonaws.com/cache --snapshotMode=redo --context . --dockerfile Dockerfile.compute-node --destination 369495373322.dkr.ecr.eu-central-1.amazonaws.com/compute-node:$GITHUB_RUN_ID
+        run: /kaniko/executor --snapshotMode=redo --cache=true --cache-repo 369495373322.dkr.ecr.eu-central-1.amazonaws.com/cache --snapshotMode=redo --context . --build-arg=TAG=$GITHUB_RUN_ID --dockerfile Dockerfile.compute-node --destination 369495373322.dkr.ecr.eu-central-1.amazonaws.com/compute-node:$GITHUB_RUN_ID
 
   promote-images:
     runs-on: dev
diff --git a/Dockerfile.compute-node b/Dockerfile.compute-node
index fdb247c610..91714f7a7f 100644
--- a/Dockerfile.compute-node
+++ b/Dockerfile.compute-node
@@ -1,4 +1,4 @@
-ARG COMPUTE_TOOLS_TAG=latest
+ARG TAG=latest
 
 FROM debian:bullseye-slim AS build-deps
 RUN apt update &&  \
@@ -56,7 +56,7 @@ RUN wget https://github.com/plv8/plv8/archive/refs/tags/v3.1.3.tar.gz && \
     rm -rf /plv8-*
 
 # Compile and run the Neon-specific `compute_ctl` binary
-FROM 369495373322.dkr.ecr.eu-central-1.amazonaws.com/rust:$COMPUTE_TOOLS_TAG AS compute-tools
+FROM 369495373322.dkr.ecr.eu-central-1.amazonaws.com/rust:$TAG AS compute-tools
 USER nonroot
 COPY --chown=nonroot compute_tools compute_tools
 COPY --chown=nonroot workspace_hack workspace_hack