diff --git a/.zuul.yaml b/.zuul.yaml
index 418a0db7f2..0755d0100e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,9 +39,36 @@
         - kolla-build-oraclelinux-source
     periodic:
       jobs:
-        - kolla-publish-ubuntu-source
-        - kolla-publish-centos-source
-        - kolla-publish-oraclelinux-source
+        - kolla-build-centos-source:
+            vars:
+              publisher: true
+            secrets:
+              - kolla_dockerhub_creds
+        - kolla-build-centos-binary:
+            vars:
+              publisher: true
+            secrets:
+              - kolla_dockerhub_creds
+        - kolla-build-ubuntu-source:
+            vars:
+              publisher: true
+            secrets:
+              - kolla_dockerhub_creds
+        - kolla-build-ubuntu-binary:
+            vars:
+              publisher: true
+            secrets:
+              - kolla_dockerhub_creds
+        - kolla-build-oraclelinux-source:
+            vars:
+              publisher: true
+            secrets:
+              - kolla_dockerhub_creds
+        - kolla-build-oraclelinux-binary:
+            vars:
+              publisher: true
+            secrets:
+              - kolla_dockerhub_creds
 
 - secret:
     name: kolla_dockerhub_creds
@@ -87,7 +114,9 @@
     timeout: 10200
     pre-run: tests/playbooks/pre.yml
     run: tests/playbooks/run.yml
-    post-run: tests/playbooks/post.yml
+    post-run:
+      - tests/playbooks/post.yml
+      - tests/playbooks/publish.yml
     attempts: 1
     required-projects:
       - openstack/kolla-ansible
@@ -117,15 +146,6 @@
       base_distro: centos
       install_type: source
 
-- job:
-    name: kolla-publish-centos-source
-    parent: kolla-build-centos-source
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-    secrets:
-      - kolla_dockerhub_creds
-
 - job:
     name: kolla-build-ubuntu-binary
     parent: kolla-base
@@ -145,15 +165,6 @@
       base_distro: ubuntu
       install_type: source
 
-- job:
-    name: kolla-publish-ubuntu-source
-    parent: kolla-build-ubuntu-source
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-    secrets:
-      - kolla_dockerhub_creds
-
 - job:
     name: kolla-build-oraclelinux-binary
     parent: kolla-base
@@ -172,12 +183,3 @@
       action: build
       base_distro: oraclelinux
       install_type: source
-
-- job:
-    name: kolla-publish-oraclelinux-source
-    parent: kolla-build-oraclelinux-source
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-    secrets:
-      - kolla_dockerhub_creds
diff --git a/tests/playbooks/publish.yml b/tests/playbooks/publish.yml
index 9a019fac93..a72dffc797 100644
--- a/tests/playbooks/publish.yml
+++ b/tests/playbooks/publish.yml
@@ -4,5 +4,9 @@
     - name: Login to Dockerhub
       command: "docker login -u {{ kolla_dockerhub_creds.user }} -p {{ kolla_dockerhub_creds.password }}"
       no_log: true
+      when:
+        - publisher
 
     - shell: "for img in $(docker images  --format '{% raw %}{{ .Repository }}:{{ .Tag }}{% endraw %}' | grep kolla ); do docker push $img; done"
+      when:
+        - publisher
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2
index 3b1ea10518..13e857178b 100644
--- a/tests/templates/kolla-build.conf.j2
+++ b/tests/templates/kolla-build.conf.j2
@@ -1,11 +1,8 @@
 [DEFAULT]
 debug = true
 {% if publisher %}
-profile = default
-profile = infra
-profile = main
 namespace = kolla
-tag = queens
+tag = {{ zuul.branch | basename }}
 {% endif %}
 push = false
 logs_dir = /tmp/logs/build