diff --git a/roles/collectd/base/templates/collectd.conf.j2 b/roles/collectd/base/templates/collectd.conf.j2
index e37e724bee..396728b0f0 100644
--- a/roles/collectd/base/templates/collectd.conf.j2
+++ b/roles/collectd/base/templates/collectd.conf.j2
@@ -42,9 +42,8 @@ LoadPlugin vmem
 </Plugin>
 
 <Plugin "interface">
-  Interface "/^veth/"
-  Interface "/^vnet/"
-  Interface "/vnet/"
+  Interface "/^veth*"
+  Interface "/^vnet.*"
   IgnoreSelected true
 </Plugin>
 
@@ -55,7 +54,7 @@ LoadPlugin vmem
   MountPoint "^/var/lib/containers/docker/.*"
   MountPoint "^/var/lib/containers/storage/.*"
   MountPoint "^/var/lib/docker/.*"
-  MountPoint "^/var/lib/origin/.*"
+  MountPoint "^/var/lib/origin.*"
   FSType "shm"
   FSType "tmpfs"
   FSType "overlay"