diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 42df7237c8..db3266ddb5 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -11,9 +11,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:
@@ -63,3 +65,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 cba3c16a97..d707f5f877 100644
--- a/tests/templates/kolla-build.conf.j2
+++ b/tests/templates/kolla-build.conf.j2
@@ -2,7 +2,8 @@
 debug = true
 {% if publisher %}
 namespace = kolla
-tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) }}
+{% set tag_suffix = '-aarch64' if ansible_architecture == 'aarch64' else '' %}
+tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
 {% endif %}
 push = false
 logs_dir = {{ kolla_build_logs_dir }}