diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml
index 22f7159f1..6d250c31e 100644
--- a/container-images/container_image_prepare_defaults.yaml
+++ b/container-images/container_image_prepare_defaults.yaml
@@ -28,7 +28,7 @@ parameter_defaults:
       # Only used if Ceph is deployed.
       ceph_namespace: docker.io/ceph
       ceph_image: daemon
-      ceph_tag: v4.0.4-stable-4.0-nautilus-centos-7-x86_64
+      ceph_tag: v4.0.8-stable-4.0-nautilus-centos-7-x86_64
 
       ceph_prometheus_namespace: docker.io/prom
       ceph_prometheus_image: prometheus
diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index 56f7adda3..13804e3fe 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -199,7 +199,7 @@ container_images:
   image_source: kolla
 - imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo
   image_source: kolla
-- imagename: docker.io/ceph/daemon:v4.0.4-stable-4.0-nautilus-centos-7-x86_64
+- imagename: docker.io/ceph/daemon:v4.0.8-stable-4.0-nautilus-centos-7-x86_64
   image_source: ceph
 - imagename: docker.io/prom/prometheus:v2.7.2
   image_source: prom
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index e5e0e936a..b764c7af1 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -236,7 +236,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'namespace': 'docker.io/tripleomaster',
                 'ceph_namespace': 'docker.io/ceph',
                 'ceph_image': 'daemon',
-                'ceph_tag': 'v4.0.4-stable-4.0-nautilus-centos-7-x86_64',
+                'ceph_tag': 'v4.0.8-stable-4.0-nautilus-centos-7-x86_64',
                 'ceph_grafana_namespace': 'docker.io/grafana',
                 'ceph_grafana_image': 'grafana',
                 'ceph_grafana_tag': '5.2.4',