diff --git a/_config b/_config
index e4dc9f6..c5acb39 100644
--- a/_config
+++ b/_config
@@ -58,7 +58,6 @@ BuildFlags: onlybuild:release-manifest-image
BuildFlags: excludebuild:endpoint-copier-operator-image
BuildFlags: excludebuild:ironic-image
BuildFlags: excludebuild:ironic-ipa-downloader-image
- BuildFlags: excludebuild:kiwi-builder-image
BuildFlags: excludebuild:kube-rbac-proxy-image
BuildFlags: excludebuild:metallb-controller-image
BuildFlags: excludebuild:metallb-speaker-image
@@ -115,6 +114,21 @@ BuildFlags: onlybuild:release-manifest-image
# Publish multi-arch container images only once all archs have been built
PublishFlags: archsync
+
+ # Exclude the images selected by the aarch64 section
+ %ifarch aarch64
+ BuildFlags: excludebuild:baremetal-operator-image
+ BuildFlags: excludebuild:edge-image-builder-image
+ BuildFlags: excludebuild:endpoint-copier-operator-image
+ BuildFlags: excludebuild:ironic-image
+ BuildFlags: excludebuild:ironic-ipa-downloader-image
+ BuildFlags: excludebuild:kube-rbac-proxy-image
+ BuildFlags: excludebuild:metallb-controller-image
+ BuildFlags: excludebuild:metallb-speaker-image
+ %endif
+
+%else
+ BuildFlags: excludebuild:kiwi-builder-image
%endif
diff --git a/_meta b/_meta
index 8d2c622..74b0546 100644
--- a/_meta
+++ b/_meta
@@ -42,8 +42,8 @@
{%- else %}
-
+
{%- endif %}
x86_64
aarch64