diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2
index 8a7bc4f20a..f0e82ac216 100644
--- a/tests/templates/kolla-build.conf.j2
+++ b/tests/templates/kolla-build.conf.j2
@@ -4,6 +4,7 @@ debug = true
 namespace = kolla
 {# TODO(mgoddard): Remove tag_suffix when CentOS 7 is no longer supported. #}
 {% set tag_suffix = '-centos8' if ansible_distribution == 'centos' and ansible_distribution_major_version == '8' else '' %}
+{% set tag_suffix = '-' ~ base_arch if base_distro == 'debian' and install_type == 'source' else '' %}
 tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
 {% endif %}
 push = false
diff --git a/tests/test_build.py b/tests/test_build.py
index 02f2b7a93a..632931ee4c 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -23,7 +23,6 @@ import testtools
 
 sys.path.append(
     os.path.abspath(os.path.join(os.path.dirname(__file__), '../tools')))
-from kolla.common import config  # noqa
 from kolla.image import build  # noqa
 
 LOG = logging.getLogger(__name__)
@@ -130,7 +129,5 @@ class BuildTestDebianSource(BuildTest, base.BaseTestCase):
 
     def setUp(self):
         super(BuildTestDebianSource, self).setUp()
-        tag = '%s-%s' % (config.OPENSTACK_RELEASE['debian'], os.uname()[4])
         self.build_args.extend(["--base", "debian",
-                                "--tag", tag,
                                 "--type", "source"])