diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index e6db697b..20968772 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -62,7 +62,7 @@ jobs:
         tags: ${{ steps.image-metadata.outputs.tags }}
         labels: ${{ steps.image-metadata.outputs.labels }}
         containerfiles: ./Dockerfile
-        archs: amd64,arm64v8,arm32v7
+        platforms: linux/amd64,linux/arm64
         oci: true
         # enable build layer caching between platforms
         layers: true
diff --git a/Dockerfile b/Dockerfile
index 05f85ceb..d63a8ca3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ RUN npm run build
 # We are using Github Actions: redhat-actions/buildah-build@v2 which needs manual selection of arch in base image
 # Remove TARGETARCH if docker buildx is supported in the CI release as --platform=$TARGETPLATFORM will be automatically set
 ARG TARGETARCH
+ARG TARGETPLATFORM
 FROM ${TARGETARCH}/nginx:stable-alpine AS cyberchef
 
 COPY --from=builder /app/build/prod /usr/share/nginx/html/