diff --git a/clusters/app.ci/supplemental-ci-images/cli-yq.yaml b/clusters/app.ci/supplemental-ci-images/cli-yq.yaml
deleted file mode 100644
index 62c8b550e6ec9..0000000000000
--- a/clusters/app.ci/supplemental-ci-images/cli-yq.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-kind: BuildConfig
-apiVersion: build.openshift.io/v1
-metadata:
-  namespace: ocp
-  name: cli-yq
-spec:
-  successfulBuildsHistoryLimit: 1
-  failedBuildsHistoryLimit: 2
-  output:
-    pushSecret:
-      name: registry-push-credentials-ci-images-mirror
-    to:
-      kind: DockerImage
-      name: quay.io/openshift/ci:ocp_cli-yq_latest
-  source:
-    dockerfile: |
-      FROM ocp/4.12:cli
-      RUN curl -L https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-      RUN yum install -y jq
-    type: Dockerfile
-  strategy:
-    dockerStrategy:
-      from:
-        kind: ImageStreamTag
-        name: 4.12:cli
-        namespace: ocp
-      imageOptimizationPolicy: SkipLayers
-    type: Docker
-  triggers:
-    - type: ConfigChange
diff --git a/clusters/build-clusters/multiarch_builds/supplemental-ci-images/cli-yq_mabc.yaml b/clusters/build-clusters/multiarch_builds/supplemental-ci-images/cli-yq_mabc.yaml
new file mode 100644
index 0000000000000..d462871d0f8ea
--- /dev/null
+++ b/clusters/build-clusters/multiarch_builds/supplemental-ci-images/cli-yq_mabc.yaml
@@ -0,0 +1,39 @@
+apiVersion: ci.openshift.io/v1
+kind: MultiArchBuildConfig
+metadata:
+  name: cli-yq
+  namespace: ocp
+spec:
+  external_registries:
+  - quay.io/openshift/ci
+  build_spec:
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 2
+    output:
+      pushSecret:
+        name: registry-push-credentials-ci-images-mirror
+      to:
+        kind: ImageStreamTag
+        namespace: ocp
+        name: cli-yq:latest
+    source:
+      dockerfile: |
+        FROM ocp/4.12:cli
+        RUN ARCH=$(uname -m) && \
+            case "$ARCH" in \
+                x86_64*) ARCH='amd64' ;; \
+                aarch64*) ARCH='arm64' ;; \
+                *) echo "Unsupported architecture: $ARCH" && exit 1 ;; \
+            esac && \
+            curl -L "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${ARCH}" -o /tmp/yq && \
+            chmod +x /tmp/yq
+        RUN yum install -y jq
+      type: Dockerfile
+    strategy:
+      dockerStrategy:
+        from:
+          kind: ImageStreamTag
+          name: 4.12:cli
+          namespace: ocp
+        imageOptimizationPolicy: SkipLayers
+      type: Docker