diff --git a/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2
index 830ed589e..0e349e2b9 100644
--- a/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2
@@ -80,7 +80,7 @@ PreCacheChain "PreCache"
 </Plugin>
 
 <Plugin disk>
-  Disk "/^[hsv]d[a-z]+[0-9]?$/"
+  Disk "/^[hsv]d[a-z]+[0-9]?|nvme.+$/"
   IgnoreSelected false
 </Plugin>
 
@@ -89,13 +89,15 @@ PreCacheChain "PreCache"
 # A Minus before the version means the process was not found in that version. (Ex -9)
 <Plugin processes>
   # Ceph (OpenStack Installed)
-  ProcessMatch "ceph-mon" "^/usr/bin/ceph-mon"                                          # Unchecked
-  ProcessMatch "ceph-osd" "^/usr/bin/ceph-osd"                                          # Unchecked
-  ProcessMatch "diamond" "python.+diamond"                                              # Unchecked
-  ProcessMatch "salt-minion" "python.+salt-minion"                                      # Unchecked
+  ProcessMatch "ceph-mon" "^/usr/bin/ceph-mon"                                          # -10
+  ProcessMatch "ceph-osd" "^/usr/bin/ceph-osd"                                          # 10
 
   # Collectd (Browbeat Installed)
   ProcessMatch "collectd" "/usr/sbin/collectd"
+
+  # OVS (OpenStack Installed)
+  ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch"                               # 10
+  ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch"                               # 10
 </Plugin>
 
 <Plugin swap>