diff --git a/monitoring/collectd-extensions/src/df.conf b/monitoring/collectd-extensions/src/df.conf
index a4f22f547..147619b8b 100644
--- a/monitoring/collectd-extensions/src/df.conf
+++ b/monitoring/collectd-extensions/src/df.conf
@@ -17,10 +17,13 @@
         MountPoint "/opt/cgcs"
         MountPoint "/opt/platform"
         MountPoint "/opt/extension"
-        MountPoint "/etc/nova/instances"
         MountPoint "/var/lib/rabbitmq"
         MountPoint "/var/lib/postgresql"
         MountPoint "/var/lib/ceph/mon"
+        MountPoint "/var/lib/docker"
+        MountPoint "/var/lib/docker-distribution"
+        MountPoint "/var/lib/kubelet"
+        MountPoint "/var/lib/nova/instances"
         MountPoint "/opt/backups"
 </Plugin>
 
diff --git a/monitoring/collectd-extensions/src/fm_notifier.py b/monitoring/collectd-extensions/src/fm_notifier.py
index c18e2dfe8..9aec6bcab 100755
--- a/monitoring/collectd-extensions/src/fm_notifier.py
+++ b/monitoring/collectd-extensions/src/fm_notifier.py
@@ -154,7 +154,10 @@ mangled_list = {"dev-shm",
                 "var-lib-rabbitmq",
                 "var-lib-postgresql",
                 "var-lib-ceph-mon",
-                "etc-nova-instances",
+                "var-lib-docker",
+                "var-lib-docker-distribution"
+                "var-lib-kubelet",
+                "var-lib-nova-instances",
                 "opt-platform",
                 "opt-cgcs",
                 "opt-etcd",