diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
index c98eee01e8..2acb4c361b 100644
--- a/compose/glance-api-registry.yml
+++ b/compose/glance-api-registry.yml
@@ -1,12 +1,12 @@
 glanceregistry:
-  image: kollaglue/centos-rdo-glance-registry:kilo
+  image: kollaglue/centos-rdo-glance-registry:latest
   name: glance-registry
   net: "host"
   restart: always
   env_file:
    - openstack.env
 glanceapi:
-  image: kollaglue/centos-rdo-glance-api:kilo
+  image: kollaglue/centos-rdo-glance-api:latest
   name: glance-api
   net: "host"
   restart: always
diff --git a/compose/heat-api-cfn.yml b/compose/heat-api-cfn.yml
index aab721e699..4399b88559 100644
--- a/compose/heat-api-cfn.yml
+++ b/compose/heat-api-cfn.yml
@@ -1,5 +1,5 @@
 heatapicfn:
-  image: kollaglue/centos-rdo-heat-api-cfn:kilo
+  image: kollaglue/centos-rdo-heat-api-cfn:latest
   name: heat-api-cfn
   net: "host"
   restart: always
diff --git a/compose/heat-api-engine.yml b/compose/heat-api-engine.yml
index 871c8c421b..84b01c10d8 100644
--- a/compose/heat-api-engine.yml
+++ b/compose/heat-api-engine.yml
@@ -1,19 +1,19 @@
 heatapi:
-  image: kollaglue/centos-rdo-heat-api:kilo
+  image: kollaglue/centos-rdo-heat-api:latest
   name: heat-api
   net: "host"
   restart: always
   env_file:
    - openstack.env
 heatengine:
-  image: kollaglue/centos-rdo-heat-engine:kilo
+  image: kollaglue/centos-rdo-heat-engine:latest
   name: heat-engine
   net: "host"
   restart: always
   env_file:
    - openstack.env
 heatapicfn:
-  image: kollaglue/centos-rdo-heat-api-cfn:kilo
+  image: kollaglue/centos-rdo-heat-api-cfn:latest
   name: heat-api-cfn
   net: "host"
   restart: always
diff --git a/compose/horizon.yml b/compose/horizon.yml
index 822a88aa41..b8ef035ccb 100644
--- a/compose/horizon.yml
+++ b/compose/horizon.yml
@@ -1,5 +1,5 @@
 horizon:
-  image: kollaglue/centos-rdo-horizon:kilo
+  image: kollaglue/centos-rdo-horizon:latest
   name: horizon
   net: "host"
   restart: always
diff --git a/compose/keystone.yml b/compose/keystone.yml
index 7c61a677f3..f84c86968e 100644
--- a/compose/keystone.yml
+++ b/compose/keystone.yml
@@ -1,5 +1,5 @@
 keystone:
-  image: kollaglue/centos-rdo-keystone:kilo
+  image: kollaglue/centos-rdo-keystone:latest
   name: keystone
   restart: always
   net: "host"
diff --git a/compose/magnum-api-conductor.yml b/compose/magnum-api-conductor.yml
index b7da90ef44..4aeaf78f07 100644
--- a/compose/magnum-api-conductor.yml
+++ b/compose/magnum-api-conductor.yml
@@ -1,12 +1,12 @@
 magnumapi:
-  image: kollaglue/centos-rdo-magnum-api:kilo
+  image: kollaglue/centos-rdo-magnum-api:latest
   name: magnum-api
   net: "host"
   restart: always
   env_file:
    - openstack.env
 magnumconductor:
-  image: kollaglue/centos-rdo-magnum-conductor:kilo
+  image: kollaglue/centos-rdo-magnum-conductor:latest
   name: magnum-conductor
   net: "host"
   restart: always
diff --git a/compose/mariadb.yml b/compose/mariadb.yml
index ba803d5323..0736784f96 100644
--- a/compose/mariadb.yml
+++ b/compose/mariadb.yml
@@ -1,10 +1,10 @@
 mariadbdata:
-  image: kollaglue/centos-rdo-mariadb-data:kilo
+  image: kollaglue/centos-rdo-mariadb-data:latest
   name: mariadbdata
   restart: on-failure
 
 mariadbapp:
-  image: kollaglue/centos-rdo-mariadb-app:kilo
+  image: kollaglue/centos-rdo-mariadb-app:latest
   name: mariadbapp
   restart: always
   env_file:
diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml
index f474bd053f..895624dffb 100644
--- a/compose/neutron-agents.yml
+++ b/compose/neutron-agents.yml
@@ -1,5 +1,5 @@
 neutronagents:
-  image: kollaglue/centos-rdo-neutron-agents:kilo
+  image: kollaglue/centos-rdo-neutron-agents:latest
   name: neutron-agents
   net: "host"
   privileged: true
diff --git a/compose/neutron-server.yml b/compose/neutron-server.yml
index 24aaa5d596..b2da8bd93b 100644
--- a/compose/neutron-server.yml
+++ b/compose/neutron-server.yml
@@ -1,5 +1,5 @@
 neutronserver:
-  image: kollaglue/centos-rdo-neutron-server:kilo
+  image: kollaglue/centos-rdo-neutron-server:latest
   name: neutron-server
   net: "host"
   restart: always
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml
index 0efe8208bd..e1f9d515f0 100644
--- a/compose/nova-api-compute-network.yml
+++ b/compose/nova-api-compute-network.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:kilo
+   image: kollaglue/centos-rdo-nova-compute-data:latest
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:kilo
+   image: kollaglue/centos-rdo-nova-libvirt:latest
    name: libvirt
    net: host
    pid: host
@@ -19,7 +19,7 @@ libvirt:
     - computedata
 
 novanetwork:
-   image: kollaglue/centos-rdo-nova-network:kilo
+   image: kollaglue/centos-rdo-nova-network:latest
    name: nova-network
    net: host
    privileged: true
@@ -38,7 +38,7 @@ novanetwork:
 # nova-metadata api is required in multi_host nova network mode.
 # http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
 novaapi:
-  image: kollaglue/centos-rdo-nova-api:kilo
+  image: kollaglue/centos-rdo-nova-api:latest
   name: nova-api
   privileged: True
   net: "host"
@@ -49,7 +49,7 @@ novaapi:
    - /lib/modules:/lib/modules:ro
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute:kilo
+   image: kollaglue/centos-rdo-nova-compute:latest
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
index ac89fd1657..1f80e768e7 100644
--- a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
+++ b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
@@ -1,5 +1,5 @@
 novaconductor:
-  image: kollaglue/centos-rdo-nova-conductor:kilo
+  image: kollaglue/centos-rdo-nova-conductor:latest
   name: nova-conductor
   net: "host"
   restart: always
@@ -9,7 +9,7 @@ novaconductor:
 # Unfortunately nova api needs to be privileged as it wants to run
 # a firewall command.
 novaapi:
-  image: kollaglue/centos-rdo-nova-api:kilo
+  image: kollaglue/centos-rdo-nova-api:latest
   name: nova-api
   privileged: True
   net: "host"
@@ -18,7 +18,7 @@ novaapi:
    - openstack.env
 
 novascheduler:
-  image: kollaglue/centos-rdo-nova-scheduler:kilo
+  image: kollaglue/centos-rdo-nova-scheduler:latest
   name: nova-scheduler
   net: "host"
   restart: always
@@ -26,7 +26,7 @@ novascheduler:
    - openstack.env
 
 novaconsoleauth:
-   image: kollaglue/centos-rdo-nova-consoleauth:kilo
+   image: kollaglue/centos-rdo-nova-consoleauth:latest
    name: nova-consoleauth
    net: "host"
    restart: always
@@ -34,7 +34,7 @@ novaconsoleauth:
     - openstack.env
 
 novanovncproxy:
-   image: kollaglue/centos-rdo-nova-novncproxy:kilo
+   image: kollaglue/centos-rdo-nova-novncproxy:latest
    name: nova-novncproxy
    net: "host"
    restart: always
diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml
index de851f4f41..1f6392c5fd 100644
--- a/compose/nova-compute-network.yml
+++ b/compose/nova-compute-network.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:kilo
+   image: kollaglue/centos-rdo-nova-compute-data:latest
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:kilo
+   image: kollaglue/centos-rdo-nova-libvirt:latest
    name: libvirt
    net: host
    pid: host
@@ -18,7 +18,7 @@ libvirt:
     - computedata
 
 novanetwork:
-   image: kollaglue/centos-rdo-nova-network:kilo
+   image: kollaglue/centos-rdo-nova-network:latest
    name: nova-network
    net: host
    privileged: true
@@ -33,7 +33,7 @@ novanetwork:
     - computedata
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute:kilo
+   image: kollaglue/centos-rdo-nova-compute:latest
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml
index 5ccabb4c83..766db52e99 100644
--- a/compose/nova-compute.yml
+++ b/compose/nova-compute.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:kilo
+   image: kollaglue/centos-rdo-nova-compute-data:latest
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt:kilo
+   image: kollaglue/centos-rdo-nova-libvirt:latest
    name: libvirt
    net: host
    pid: host
@@ -19,7 +19,7 @@ libvirt:
     - computedata
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute:kilo
+   image: kollaglue/centos-rdo-nova-compute:latest
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/rabbitmq.yml b/compose/rabbitmq.yml
index f2cfc6fb53..504ed9beea 100644
--- a/compose/rabbitmq.yml
+++ b/compose/rabbitmq.yml
@@ -1,5 +1,5 @@
 rabbitmq:
-  image: kollaglue/centos-rdo-rabbitmq:kilo
+  image: kollaglue/centos-rdo-rabbitmq:latest
   name: rabbitmq
   restart: always
   net: "host"
diff --git a/tools/build-docker-image b/tools/build-docker-image
index c816fd089e..da819dde31 100755
--- a/tools/build-docker-image
+++ b/tools/build-docker-image
@@ -7,7 +7,7 @@ RELEASE_NAMESPACE=kollaglue
 NAMESPACE=kollaglue
 PREFIX=centos-rdo-
 TAG=$(git rev-parse --short HEAD)
-RELEASE_TAG=kilo
+RELEASE_TAG=latest
 
 usage () {
     cat <<EOF