diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index b7abcd142..eae2294a6 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -85,3 +85,4 @@ container_images:
 - imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
 - imagename: tripleoupstream/centos-binary-tacker:latest
 - imagename: tripleoupstream/centos-binary-zaqar:latest
+- imagename: ceph/daemon:tag-build-master-jewel-centos-7
diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2
index abc6670bd..29bdc65ec 100644
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@@ -1,5 +1,9 @@
 {% set namespace=namespace or "tripleoupstream" %}
 
+{% set ceph_namespace=ceph_namespace or "ceph" %}
+{% set ceph_image=ceph_image or "daemon" %}
+{% set ceph_tag=ceph_tag or "tag-build-master-jewel-centos-7" %}
+
 {% if name_prefix and not name_prefix.endswith('-') %}
 {% set name_prefix=name_prefix + "-" %}
 {% else %}
@@ -618,10 +622,12 @@ container_images_template:
   services:
   - OS::TripleO::Services::Zaqar
 
-# FIXME(gfidente): we don't use any prefix here so it would be nice to
-# not have the --pull-source registry prepended, we can probably add
-# another {{keyword}} to describe where we want and where we do not
-#
-#- imagename: "ceph/daemon:tag-build-master-jewel-centos-7"
-#  params:
-#  - DockerCephDaemonImage
+- imagename: "{{ceph_namespace}}/{{ceph_image}}:{{ceph_tag}}"
+  params:
+  - DockerCephDaemonImage
+  services:
+  - OS::TripleO::Services::CephMds
+  - OS::TripleO::Services::CephMon
+  - OS::TripleO::Services::CephOSD
+  - OS::TripleO::Services::CephRgw
+  - OS::TripleO::Services::CephRbdMirror