diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index 7dbd75310..5aeb41a2f 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -1,19 +1,21 @@
 container_images:
 - imagename: tripleoupstream/centos-binary-aodh-api:latest
 - imagename: tripleoupstream/centos-binary-aodh-evaluator:latest
-- imagename: tripleoupstream/centos-binary-aodh-notifier:latest
 - imagename: tripleoupstream/centos-binary-aodh-listener:latest
-- imagename: tripleoupstream/centos-binary-etcd:latest
+- imagename: tripleoupstream/centos-binary-aodh-notifier:latest
 - imagename: tripleoupstream/centos-binary-ceilometer-central:latest
 - imagename: tripleoupstream/centos-binary-ceilometer-compute:latest
 - imagename: tripleoupstream/centos-binary-ceilometer-notification:latest
+- imagename: tripleoupstream/centos-binary-cinder-api:latest
+- imagename: tripleoupstream/centos-binary-cinder-backup:latest
+- imagename: tripleoupstream/centos-binary-cinder-scheduler:latest
+- imagename: tripleoupstream/centos-binary-etcd:latest
 - imagename: tripleoupstream/centos-binary-glance-api:latest
 - imagename: tripleoupstream/centos-binary-gnocchi-api:latest
 - imagename: tripleoupstream/centos-binary-gnocchi-metricd:latest
 - imagename: tripleoupstream/centos-binary-gnocchi-statsd:latest
-- imagename: tripleoupstream/centos-binary-heat-api:latest
 - imagename: tripleoupstream/centos-binary-heat-api-cfn:latest
-- imagename: tripleoupstream/centos-binary-heat-api-cloudwatch:latest
+- imagename: tripleoupstream/centos-binary-heat-api:latest
 - imagename: tripleoupstream/centos-binary-heat-engine:latest
 - imagename: tripleoupstream/centos-binary-ironic-api:latest
 - imagename: tripleoupstream/centos-binary-ironic-conductor:latest
@@ -32,9 +34,9 @@ container_images:
 - imagename: tripleoupstream/centos-binary-neutron-server:latest
 - imagename: tripleoupstream/centos-binary-nova-api:latest
 - imagename: tripleoupstream/centos-binary-nova-base:latest
+- imagename: tripleoupstream/centos-binary-nova-compute-ironic:latest
 - imagename: tripleoupstream/centos-binary-nova-compute:latest
 - imagename: tripleoupstream/centos-binary-nova-conductor:latest
-- imagename: tripleoupstream/centos-binary-nova-compute-ironic:latest
 - imagename: tripleoupstream/centos-binary-nova-libvirt:latest
 - imagename: tripleoupstream/centos-binary-nova-placement-api:latest
 - imagename: tripleoupstream/centos-binary-nova-scheduler:latest
@@ -45,6 +47,6 @@ container_images:
 - imagename: tripleoupstream/centos-binary-sahara-engine:latest
 - imagename: tripleoupstream/centos-binary-swift-account:latest
 - imagename: tripleoupstream/centos-binary-swift-container:latest
-- imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
 - imagename: tripleoupstream/centos-binary-swift-object:latest
+- imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
 - imagename: tripleoupstream/centos-binary-zaqar:latest