diff --git a/tasks/backends/iscsi.yml b/tasks/backends/iscsi.yml
index 07c602e..0bf4b00 100644
--- a/tasks/backends/iscsi.yml
+++ b/tasks/backends/iscsi.yml
@@ -103,7 +103,7 @@
     - name: cinder-volume
       securityContext:
         privileged: true
-      image: tripleoupstream/centos-binary-cinder-volume:latest
+      image: tripleomaster/centos-binary-cinder-volume:current-tripleo
       volumeMounts:
         - name: kolla-config
           mountPath: /var/lib/kolla/config_files/
@@ -163,7 +163,7 @@
     - name: iscsid
       securityContext:
         privileged: true
-      image: tripleoupstream/centos-binary-iscsid:latest
+      image: tripleomaster/centos-binary-iscsid:current-tripleo
       volumeMounts:
         - mountPath: /etc/localtime
           name: host-etc-localtime
diff --git a/tasks/backends/rbd.yml b/tasks/backends/rbd.yml
index cda0847..5e5a483 100644
--- a/tasks/backends/rbd.yml
+++ b/tasks/backends/rbd.yml
@@ -71,7 +71,7 @@
       service: cinder-volume-rbd
     containers:
     - name: cinder-volume
-      image: tripleoupstream/centos-binary-cinder-volume:latest
+      image: tripleomaster/centos-binary-cinder-volume:current-tripleo
       volumeMounts:
         - name: kolla-config
           mountPath: /var/lib/kolla/config_files/
diff --git a/tasks/backends/xtremio.yml b/tasks/backends/xtremio.yml
index 304824a..3a96b53 100644
--- a/tasks/backends/xtremio.yml
+++ b/tasks/backends/xtremio.yml
@@ -50,7 +50,7 @@
       service: cinder-volume-xtremio
     containers:
     - name: cinder-volume
-      image: tripleoupstream/centos-binary-cinder-volume:latest
+      image: tripleomaster/centos-binary-cinder-volume:current-tripleo
       volumeMounts:
         - name: kolla-config
           mountPath: /var/lib/kolla/config_files/
diff --git a/tasks/cinder-api.yml b/tasks/cinder-api.yml
index 4a71082..f87e1b7 100644
--- a/tasks/cinder-api.yml
+++ b/tasks/cinder-api.yml
@@ -89,7 +89,7 @@
       service: cinder-api
     containers:
     - name: cinder-api
-      image: tripleoupstream/centos-binary-cinder-api:latest
+      image: tripleomaster/centos-binary-cinder-api:current-tripleo
       ports:
         - container_port: 8776
           protocol: TCP
diff --git a/tasks/cinder-scheduler.yml b/tasks/cinder-scheduler.yml
index fad9ffb..a4fead1 100644
--- a/tasks/cinder-scheduler.yml
+++ b/tasks/cinder-scheduler.yml
@@ -50,7 +50,7 @@
       service: cinder-scheduler
     containers:
     - name: cinder-scheduler
-      image: tripleoupstream/centos-binary-cinder-scheduler:latest
+      image: tripleomaster/centos-binary-cinder-scheduler:current-tripleo
       env:
         - name: TZ
           value: UTC
diff --git a/tasks/init-jobs.yml b/tasks/init-jobs.yml
index 1015d94..24fea3e 100644
--- a/tasks/init-jobs.yml
+++ b/tasks/init-jobs.yml
@@ -42,7 +42,7 @@
     restart_policy: OnFailure
     containers:
     - name: cinder-create-db
-      image: tripleoupstream/centos-binary-kolla-toolbox:latest
+      image: tripleomaster/centos-binary-kolla-toolbox:current-tripleo
       image_pull_policy: IfNotPresent
       command: ["sh", "-c"]
       args:
@@ -66,7 +66,7 @@
     restart_policy: OnFailure
     containers:
     - name: cinder-create-db
-      image: tripleoupstream/centos-binary-kolla-toolbox:latest
+      image: tripleomaster/centos-binary-kolla-toolbox:current-tripleo
       image_pull_policy: IfNotPresent
       command: ["sh", "-c"]
       args:
@@ -97,7 +97,7 @@
     restart_policy: OnFailure
     containers:
     - name: cinder-create-db
-      image: tripleoupstream/centos-binary-cinder-api:latest
+      image: tripleomaster/centos-binary-cinder-api:current-tripleo
       image_pull_policy: IfNotPresent
 #      command: ["/usr/bin/cinder-manage", "db", "sync"]
       env: