diff --git a/.github/workflows/operator-ci.yaml b/.github/workflows/operator-ci.yaml
index 2357d1c9..9df60332 100644
--- a/.github/workflows/operator-ci.yaml
+++ b/.github/workflows/operator-ci.yaml
@@ -48,6 +48,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
   GO_VERSION: 1.23.6
+  PLATFORMS: linux/amd64,linux/arm64
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
@@ -122,6 +123,8 @@ jobs:
 
       - name: Build the operator container image
         id: build
+        with:
+          platforms: ${{ env.PLATFORMS }}
         run: |
           apt-get update && apt-get install -y make git jq
           cd operator
@@ -148,7 +151,7 @@ jobs:
             --build-arg VERSION=${OPERATOR_VERSION} \
             --build-arg GO_VERSION=${GO_VERSION} \
             --push \
-            --platform linux/amd64 \
+            --platform ${{ env.platforms }} \
             ${TAGS@L} \
             --metadata-file=metadata.json \
             -f ../containers/operator.Dockerfile .
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 225d1e9a..9d6a5c12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,12 +18,6 @@
 # LICENSE END
 # 
 
-
-
-
-
-
-
 default:
   tags:
      - baseos-infra
@@ -35,7 +29,7 @@ variables:
   KUBERNETES_MEMORY_LIMIT: "6Gi"
   KUBERNETES_MEMORY_REQUEST: "3Gi"
   GO_VERSION: 1.23.4
-  ARCH_LIST: "linux/amd64"
+  ARCH_LIST: "linux/amd64,linux/arm64"
 
 workflow:
   rules:
@@ -125,7 +119,6 @@ mirror-agent-image:
     DOCKER_TLS_CERTDIR: "/certs"
     DOCKER_TLS_VERIFY: 1
     DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
-    ARCH_LIST: "linux/amd64,linux/arm64" # TODO: until operator has both archs override agent to use both
   before_script:
     - echo "{\"auths\":{\"${NVCR_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${NVCR_REGISTRY_USER}" "${NVCR_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"${GHCR_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${GHCR_REGISTRY_USER}" "${GHCR_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > config.json
   script: