diff --git a/images/ovn/Dockerfile b/images/ovn/Dockerfile
index ac67d54..5de13bb 100644
--- a/images/ovn/Dockerfile
+++ b/images/ovn/Dockerfile
@@ -14,7 +14,8 @@
 EOF
 
 FROM registry.atmosphere.dev/library/openvswitch:${RELEASE}
-ADD --chmod=755 https://dl.k8s.io/release/v1.29.3/bin/linux/amd64/kubectl /usr/local/bin/kubectl
+ARG TARGETPLATFORM
+ADD --chmod=755 https://dl.k8s.io/release/v1.29.3/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
 ARG OVN_SERIES=23.09
 ARG OVN_VERSION=${OVN_SERIES}.0-136
 RUN <<EOF sh -xe
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index 26fe4bf..b11ef16 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -37,6 +37,7 @@
           repository: registry.atmosphere.dev/library/kubernetes-entrypoint
           arch:
             - linux/amd64
+            - linux/arm64
           tags:
             - "{{ zuul.branch | replace('stable/', '') }}"
     files: &container_image_files
diff --git a/zuul.d/container-images/libvirt-tls-sidecar.yaml b/zuul.d/container-images/libvirt-tls-sidecar.yaml
index 0899068..93d997f 100644
--- a/zuul.d/container-images/libvirt-tls-sidecar.yaml
+++ b/zuul.d/container-images/libvirt-tls-sidecar.yaml
@@ -40,6 +40,7 @@
           repository: registry.atmosphere.dev/library/libvirt-tls-sidecar
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
           tags:
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index 0c34b3e..4fd0cef 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -43,6 +43,7 @@
           repository: registry.atmosphere.dev/library/libvirtd
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - PROJECT=nova
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index 7751cef..bfa764e 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -47,6 +47,7 @@
           repository: registry.atmosphere.dev/library/magnum
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - PROJECT=magnum
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index 8e9557d..66ce8aa 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -47,6 +47,7 @@
           repository: registry.atmosphere.dev/library/neutron
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - PROJECT=neutron
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index df638aa..b38faf4 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -43,6 +43,7 @@
           repository: registry.atmosphere.dev/library/nova-ssh
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - PROJECT=nova
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index 3d07802..a74080a 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -47,6 +47,7 @@
           repository: registry.atmosphere.dev/library/nova
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - PROJECT=nova
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index b2cbcca..c3bbe01 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -43,6 +43,7 @@
           repository: registry.atmosphere.dev/library/openstack-python-runtime
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - "FROM=registry.atmosphere.dev/library/python-base:{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
index 9350890..45036da 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -41,6 +41,7 @@
           repository: registry.atmosphere.dev/library/openstack-runtime
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
           tags:
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index 9c29e29..e5dabfb 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -43,6 +43,7 @@
           repository: registry.atmosphere.dev/library/openstack-venv-builder
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
           tags:
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index 9e6a4ad..e2345e2 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -37,6 +37,7 @@
           repository: registry.atmosphere.dev/library/openvswitch
           arch:
             - linux/amd64
+            - linux/arm64
           tags:
             - "{{ zuul.branch | replace('stable/', '') }}"
     files: &container_image_files
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index 0c31387..e7735cb 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -49,6 +49,7 @@
           repository: registry.atmosphere.dev/library/ovn-host
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
             - OVN_COMPONENT=host
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index 0bb84e4..5faec22 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -41,6 +41,7 @@
           repository: registry.atmosphere.dev/library/python-base
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
           tags:
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index 563fc34..f4a62ca 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -39,6 +39,7 @@
           repository: registry.atmosphere.dev/library/ubuntu-cloud-archive
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
           tags:
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 9c3f633..86d7363 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -37,6 +37,7 @@
           repository: registry.atmosphere.dev/library/ubuntu
           arch:
             - linux/amd64
+            - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
           tags: