diff --git a/.zuul.yaml b/.zuul.yaml
index efc1dbab..484c8eaf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -80,3 +80,14 @@
           e0l2V9DB0+EuIz9edPRpa3vsh3sgdjj8mjxyJKMpm45UKh6nQU2iFwxs1yBYTm36e9YQk
           sUcWtrtIEz6tuaVuv5Dg/V46MuPJbD6ICcGOCDAFIsxLgAYzbQiTq/uLcLk8lqi0H9VmB
           QTIjYorotK3OoLAGvZaCRP37PG3d5iNzYtdVNq37p1jFoPYpFdiBLb0dqAn4Qk=
+      email: !encrypted/pkcs1-oaep
+        - cxcAl94P4831hThRHYbve05Xk1E5NsG/CzQgvBr6hzmF7wiHIPMMYRf9dMXpZ5/2KUjxE
+          PVHy6ymbZPtLLjOJ1ESPH2f+Evt2p02JECqJYdjV8p/S3YcWSb9omTe5Ss1bSEjmmvQS3
+          uhnPrX7xj8Fx0h87p0JfRc/rZiwJWjfxTmQxg1R9g9vuq1KYfnfsvRNX0q8ZMjeDlz3yu
+          7YemnqtDQSmlgNUUmwX7MfFsbXg2gkzrlIzfZQ+MIMWnLYP+F5UEPX8BaRQpcLXDlwB8V
+          112Qlr9P5Rj/9Hb9Yk8ehVfbXNAfroR/b6Cp5zGicAS3DURfeYayo3lprjaIsTFuzzrPa
+          jmQLyPW3FWHAC4WcTs2PjO2QTawV4hUoU9eoKXoKPfmO2g1r9SLaQNqwr7KSIGhPwZ2pC
+          EYA2TSrbsggMwVO6F0fujsu6xr0jhR/0wY+JWDoruIhJ46EfQrWnMqIKbu4LyYQrRhAmG
+          IX8rPYWPNaeSm5v8gHakgMY/KUQtKsF+rWF9dpRsOzbEKFMq0ukLIGw4vCtzQuv+MKhpV
+          apusK7+y9CGWj36WK2Mnl52GOI2p221LdwSXHWNePbgnYaIA4EeSItdUX4VPap3F6AJjY
+          WwMw7h+u+413aZNTkIwHOTLM3K8Zx5zZLv4c0booyLc7v0bxxi41IZ5tnl/UB0=
diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml
index d88f8876..0aacd581 100644
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@@ -39,8 +39,9 @@
 
     - name: Docker login
       docker_login:
-        username: "{{ airship_dockerhub_creds.username }}"
+        email: "{{ airship_dockerhub_creds.email }}"
         password: "{{ airship_dockerhub_creds.password }}"
+        username: "{{ airship_dockerhub_creds.username }}"
       become: True
       when: publish