diff --git a/.zuul.yaml b/.zuul.yaml
index 4db5908..343d472 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -90,7 +90,7 @@
 - job:
     name: publish-loci-cinder
     parent: loci-cinder
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -105,7 +105,7 @@
 - job:
     name: publish-loci-designate
     parent: loci-designate
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -120,7 +120,7 @@
 - job:
     name: publish-loci-glance
     parent: loci-glance
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -135,7 +135,7 @@
 - job:
     name: publish-loci-heat
     parent: loci-heat
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -150,7 +150,7 @@
 - job:
     name: publish-loci-horizon
     parent: loci-horizon
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -165,7 +165,7 @@
 - job:
     name: publish-loci-ironic
     parent: loci-ironic
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -180,7 +180,7 @@
 - job:
     name: publish-loci-keystone
     parent: loci-keystone
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -195,7 +195,7 @@
 - job:
     name: publish-loci-murano
     parent: loci-murano
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -210,7 +210,7 @@
 - job:
     name: publish-loci-neutron
     parent: loci-neutron
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -225,7 +225,7 @@
 - job:
     name: publish-loci-nova
     parent: loci-nova
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -241,7 +241,7 @@
 - job:
     name: publish-loci-requirements
     parent: loci-requirements
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -256,7 +256,7 @@
 - job:
     name: publish-loci-swift
     parent: loci-swift
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
 
@@ -271,6 +271,6 @@
 - job:
     name: publish-loci-trove
     parent: loci-trove
-    run: playbooks/push
+    post-run: playbooks/push
     secrets:
       - loci_docker_login
diff --git a/playbooks/loci-builder.yaml b/playbooks/loci-builder.yaml
index 096ce32..c86c1c0 100644
--- a/playbooks/loci-builder.yaml
+++ b/playbooks/loci-builder.yaml
@@ -53,7 +53,8 @@
       block:
         - docker_image:
             path: "{{ zuul.project.src_dir }}"
-            name: openstackloci/{{ project }}:master-{{ item.name }}
+            name: openstackloci/{{ project }}
+            tag: master-{{ item.name }}
             pull: False
             buildargs: "{{ item.buildargs.project }}"
           with_items: "{{ distros }}"
@@ -69,12 +70,3 @@
             - build_result.finished
           retries: 300
           delay: 5
-
-    - name: Push project to DockerHub
-      block:
-        - command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }}
-          no_log: True
-        - command: docker push openstackloci/{{ project }}:master-{{ item.name }}
-          with_items: "{{ distros }}"
-      become: True
-      when: loci_docker_login is defined
diff --git a/playbooks/push.yaml b/playbooks/push.yaml
index 24e6c03..2b483d8 100644
--- a/playbooks/push.yaml
+++ b/playbooks/push.yaml
@@ -8,4 +8,3 @@
           no_log: True
         - command: docker push openstackloci/{{ project }}:master-{{ item.name }}
           with_items: "{{ distros }}"
-      become: True