diff --git a/docker/Dockerfile b/docker/Dockerfile
index 346aa9d..3065e0c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,9 +5,14 @@ ARG TARGETPLATFORM
 FROM node:20.17.0-bookworm AS node
 FROM golang:1.23.1-bookworm AS golang
 
-# Set the base image, general environment variables, and move to temp dir
+# Set the base image
 FROM debian:12.7
+
+# Re-declare ARG after FROM to make it available in this build stage
+ARG TARGETPLATFORM
 RUN echo "Building for ${TARGETPLATFORM}"
+
+# Set the general environment variables, and move to temp dir
 ENV DEBIAN_FRONTEND="noninteractive"
 ENV GOBIN="/usr/local/go-bin"
 ENV PATH="$PATH:/usr/local/go-bin:/usr/local/dl-bin:/usr/local/go/bin"
diff --git a/docker/Dockerfile.cicd b/docker/Dockerfile.cicd
index 52d4993..a4ff18a 100644
--- a/docker/Dockerfile.cicd
+++ b/docker/Dockerfile.cicd
@@ -5,9 +5,14 @@ ARG TARGETPLATFORM
 FROM node:20.17.0-bookworm AS node
 FROM golang:1.23.1-bookworm AS golang
 
-# Set the base image, general environment variables, and move to temp dir
+# Set the base image
 FROM debian:12.7
+
+# Re-declare ARG after FROM to make it available in this build stage
+ARG TARGETPLATFORM
 RUN echo "Building for ${TARGETPLATFORM}"
+
+# Set the general environment variables, and move to temp dir
 ENV DEBIAN_FRONTEND="noninteractive"
 ENV GOBIN="/usr/local/go-bin"
 ENV PATH="$PATH:/usr/local/go-bin:/usr/local/dl-bin:/usr/local/go/bin"
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index d5d1620..f3d1881 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -5,9 +5,14 @@ ARG TARGETPLATFORM
 FROM node:20.17.0-bookworm AS node
 FROM golang:1.23.1-bookworm AS golang
 
-# Set the base image, general environment variables, and move to temp dir
+# Set the base image
 FROM debian:12.7
+
+# Re-declare ARG after FROM to make it available in this build stage
+ARG TARGETPLATFORM
 RUN echo "Building for ${TARGETPLATFORM}"
+
+# Set the general environment variables, and move to temp dir
 ENV DEBIAN_FRONTEND="noninteractive"
 ENV GOBIN="/usr/local/go-bin"
 ENV PATH="$PATH:/usr/local/go-bin:/usr/local/dl-bin:/usr/local/go/bin"