diff --git a/roles/airshipctl-publish-images/tasks/main.yaml b/roles/airshipctl-publish-images/tasks/main.yaml
index af8c0aa4c..4ae833c61 100644
--- a/roles/airshipctl-publish-images/tasks/main.yaml
+++ b/roles/airshipctl-publish-images/tasks/main.yaml
@@ -25,8 +25,8 @@
   block:
     - name: Login to Image Registry
       docker_login:
-        username: "{{ image-repo-credentials.username }}"
-        password: "{{ image-repo-credentials.password }}"
+        username: "{{ image_repo_credentials.username }}"
+        password: "{{ image_repo_credentials.password }}"
         registry_url: "{{ image_repo }}"
 
     - name: Push Image with Latest Tag
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 5583e9f19..d923fa37f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -36,7 +36,7 @@
     nodeset: airship-airshipctl-single-node
     secrets:
       - name: github_credentials
-        secret: airship-airshipctl-airshipit-github-username-password
+        secret: airship_airshipctl_airshipit_github_username_password
 
 - job:
     name: airship-airshipctl-build-image
@@ -60,7 +60,7 @@
       git_mirror_repository: airshipit/airshipctl
     secrets:
       - name: git_mirror_credentials
-        secret: airship-airshipctl-airshipit-github-secret
+        secret: airship_airshipctl_airshipit_github_secret
         pass-to-parent: true
 
 - job:
@@ -96,7 +96,7 @@
     parent: airship-airshipctl-build-image
     post-run: playbooks/airship-airshipctl-publish-images.yaml
     secrets:
-      - airshipctl-image-repo-credentials
+      - airshipctl_image_repo_credentials
     vars:
       image: quay.io/airshipit/airshipctl
       image_repo: https://quay.io/api/v1/
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index 6e6ac5754..bf38c985b 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 - secret:
-    name: airship-airshipctl-airshipit-github-secret
+    name: airship_airshipctl_airshipit_github_secret
     data:
       user: git
       host: github.com
@@ -59,7 +59,7 @@
           595F3m2UtgR6QKN5xbJJmWp7ipihdRvQ1eVl5GCjG7MBi27YvILp4cIWg+MO1I=
 
 - secret:
-    name: airship-airshipctl-airshipit-github-username-password
+    name: airship_airshipctl_airshipit_github_username_password
     data:
       username: airshipbot
       password: !encrypted/pkcs1-oaep
@@ -75,7 +75,7 @@
           zY8AzTMSMOKEzSaiiT2lvzBMFhSNRIBTM+m8I+DDBooy0nM4ijcHSP7MdOhGbs=
 
 - secret:
-    name: airshipctl-image-repo-credentials
+    name: airshipctl_image_repo_credentials
     data:
       username: !encrypted/pkcs1-oaep
         - IrKFuv6QJnGT7C/c6a4GCmDLJn0rZ82ivaAd3BjP3QyTegM95gVCOFC4l45NGRLLtzFun