diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 5c2d93c9ca..0dadcce98b 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -8,9 +8,11 @@
     periodic:
       jobs:
         - kolla-publish-debian-source
+        - kolla-publish-debian-source-aarch64
     release:
       jobs:
         - kolla-publish-debian-source
+        - kolla-publish-debian-source-aarch64
         - kolla-publish-debian-binary
 
 - job:
@@ -50,3 +52,8 @@
       publisher: true
     secrets:
       - kolla_dockerhub_creds
+
+- job:
+    name: kolla-publish-debian-source-aarch64
+    parent: kolla-publish-debian-source
+    nodeset: kolla-debian-buster-aarch64
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2
index 25afce62f4..f9a501da27 100644
--- a/tests/templates/kolla-build.conf.j2
+++ b/tests/templates/kolla-build.conf.j2
@@ -2,8 +2,13 @@
 debug = true
 {% if publisher %}
 namespace = kolla
+{# NOTE(hrw): we do not publish centos images for aarch64 so can just override #}
+{% if ansible_architecture == 'aarch64' %}
+{% set tag_suffix = '-aarch64' %}
+{% else %}
 {# TODO(mgoddard): Remove tag_suffix when CentOS 7 is no longer supported. #}
 {% set tag_suffix = '-centos8' if ansible_distribution | lower == 'centos' and base_tag | default == 8 else '' %}
+{% endif %}
 tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
 {% endif %}
 push = false