diff --git a/roles/build-docker-image/common.rst b/roles/build-docker-image/common.rst
index c2c65df42..42757816f 100644
--- a/roles/build-docker-image/common.rst
+++ b/roles/build-docker-image/common.rst
@@ -42,7 +42,7 @@ using this role.
    The project directory.  Serves as the base for
    :zuul:rolevar:`build-docker-image.docker_images.context`.
 
-.. zuul:rolevar:: credentials
+.. zuul:rolevar:: docker_credentials
    :type: dict
 
    This is only required for the upload and promote roles.  This is
diff --git a/roles/build-docker-image/tasks/main.yaml b/roles/build-docker-image/tasks/main.yaml
index 5db905099..795cbf7df 100644
--- a/roles/build-docker-image/tasks/main.yaml
+++ b/roles/build-docker-image/tasks/main.yaml
@@ -10,4 +10,4 @@
     --tag {{ item.repository }}:change_{{ zuul.change }}
   args:
     chdir: "{{ zuul_work_dir }}/{{ item.context }}"
-  loop: "{{ images }}"
+  loop: "{{ docker_images }}"
diff --git a/roles/promote-docker-image/tasks/main.yaml b/roles/promote-docker-image/tasks/main.yaml
index 025303a89..0eb42dece 100644
--- a/roles/promote-docker-image/tasks/main.yaml
+++ b/roles/promote-docker-image/tasks/main.yaml
@@ -5,16 +5,16 @@
     url: "https://hub.docker.com/v2/users/login/"
     body_format: json
     body:
-      username: "{{ credentials.username }}"
-      password: "{{ credentials.password }}"
+      username: "{{ docker_credentials.username }}"
+      password: "{{ docker_credentials.password }}"
   register: jwt_token
 - name: Promote image
-  loop: "{{ images }}"
+  loop: "{{ docker_images }}"
   loop_control:
     loop_var: image
   include_tasks: promote-retag.yaml
 - name: Delete obsolete tags
-  loop: "{{ images }}"
+  loop: "{{ docker_images }}"
   loop_control:
     loop_var: image
   include_tasks: promote-cleanup.yaml
diff --git a/roles/promote-docker-image/tasks/promote-retag.yaml b/roles/promote-docker-image/tasks/promote-retag.yaml
index 77b611ac8..255e4bd4a 100644
--- a/roles/promote-docker-image/tasks/promote-retag.yaml
+++ b/roles/promote-docker-image/tasks/promote-retag.yaml
@@ -2,8 +2,8 @@
   no_log: true
   uri:
     url: "https://auth.docker.io/token?service=registry.docker.io&scope=repository:{{ image.repository }}:pull,push"
-    user: "{{ credentials.username }}"
-    password: "{{ credentials.password }}"
+    user: "{{ docker_credentials.username }}"
+    password: "{{ docker_credentials.password }}"
     force_basic_auth: true
   register: token
 - name: Get manifest
diff --git a/roles/upload-docker-image/tasks/main.yaml b/roles/upload-docker-image/tasks/main.yaml
index ff49915a6..65be3c59f 100644
--- a/roles/upload-docker-image/tasks/main.yaml
+++ b/roles/upload-docker-image/tasks/main.yaml
@@ -1,6 +1,6 @@
 - name: Log in to dockerhub
-  command: "docker login -u {{ credentials.username }} -p {{ credentials.password }}"
+  command: "docker login -u {{ docker_credentials.username }} -p {{ docker_credentials.password }}"
   no_log: true
 - name: Upload to dockerhub
   command: "docker push {{ item.repository }}:change_{{ zuul.change }}"
-  loop: "{{ images }}"
+  loop: "{{ docker_images }}"