diff --git a/.github/workflows/peerpod-ctrl_image.yaml b/.github/workflows/peerpod-ctrl_image.yaml
index 444dc7f6c..c22ec5487 100644
--- a/.github/workflows/peerpod-ctrl_image.yaml
+++ b/.github/workflows/peerpod-ctrl_image.yaml
@@ -56,6 +56,4 @@ jobs:
             quay.io/confidential-containers/peerpod-ctrl:${{ github.sha }}
           context: peerpod-ctrl
           platforms: linux/s390x
-          build-args: |
-            -tags=aws,azure,ibmcloud,vsphere,libvirt
 
diff --git a/peerpod-ctrl/Dockerfile b/peerpod-ctrl/Dockerfile
index 53849c7a6..7330e3843 100644
--- a/peerpod-ctrl/Dockerfile
+++ b/peerpod-ctrl/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.
 ARG TARGETOS
 ARG TARGETARCH
 ARG CGO_ENABLED=1
-ARG GOFLAGS
+ARG GOFLAGS="-tags=aws,azure,ibmcloud,vsphere,libvirt"
 
 WORKDIR /workspace
 RUN if [ "$CGO_ENABLED" = 1 ] ; then dnf install -y libvirt-devel && dnf clean all; fi