diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index c1e5cd9d2..d1550034d 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -25,11 +25,11 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3'
-    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_rbd_pool: 'docker.io/port/ceph-config-helper:v1.10.3'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
+    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index 846ef1e20..687b71e7e 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -24,10 +24,10 @@ deployment:
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3'
-    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.3'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
+    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index e2ad779e2..232ce65b0 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -20,9 +20,9 @@
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest'
-    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3'
+    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
     image_repo_sync: 'docker.io/docker:17.07.0'
   local_registry:
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index 9268f0602..80cf01e43 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -28,9 +28,9 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
     ceph_cephfs_provisioner: 'quay.io/external_storage/cephfs-provisioner:v1.1.0-k8s1.10'
-    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
     ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v1.1.0-k8s1.10'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
     image_repo_sync: 'docker.io/docker:17.07.0'
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index 90fdff627..7364bd6e8 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -25,11 +25,11 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3'
-    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:latest'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
+    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial'
     dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
     image_repo_sync: 'docker.io/docker:17.07.0'
-    rgw_s3_admin: 'docker.io/port/ceph-config-helper:v1.10.3'
+    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
     ks_endpoints: 'docker.io/openstackhelm/heat:newton'
     ks_service: 'docker.io/openstackhelm/heat:newton'
     ks_user: 'docker.io/openstackhelm/heat:newton'