diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index 4b573a3109..9b53abd4da 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@@ -10,6 +10,7 @@ MAINTAINER {{ maintainer }}
 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
    {% set ceph_base_packages = [
         'ceph',
+        'ceph-fuse',
         'ceph-radosgw',
         'parted',
         'hdparm',
@@ -20,6 +21,7 @@ MAINTAINER {{ maintainer }}
 {% elif base_distro in ['ubuntu', 'debian'] %}
    {% set ceph_base_packages = [
         'ceph',
+        'ceph-fuse',
         'radosgw',
         'parted',
         'hdparm',
diff --git a/docker/ceph/ceph-mds/Dockerfile.j2 b/docker/ceph/ceph-mds/Dockerfile.j2
new file mode 100644
index 0000000000..61c64fba09
--- /dev/null
+++ b/docker/ceph/ceph-mds/Dockerfile.j2
@@ -0,0 +1,7 @@
+FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block ceph_mds_header %}{% endblock %}
+
+{% block ceph_mds_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/docker/ceph/cephfs-fuse/Dockerfile.j2 b/docker/ceph/cephfs-fuse/Dockerfile.j2
new file mode 100644
index 0000000000..d738a73dd8
--- /dev/null
+++ b/docker/ceph/cephfs-fuse/Dockerfile.j2
@@ -0,0 +1,11 @@
+FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block cephfs_fuse_header %}{% endblock %}
+
+{% block cephfs_fuse_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+# Clear any customisation by Kolla to entrypoint & command
+ENTRYPOINT ["/usr/bin/ceph-fuse"]
+CMD []