diff --git a/templates/915_service-snmp.yaml.tt2 b/templates/915_service-snmp.yaml.tt2
index 75f827c..7290fe3 100644
--- a/templates/915_service-snmp.yaml.tt2
+++ b/templates/915_service-snmp.yaml.tt2
@@ -1,75 +1,87 @@
+[%
+  hostname = ngcp.get_hostname();
+
+  is_mgmt = ngcp.has_role(hostname, 'mgmt');
+  is_proxy = ngcp.has_role(hostname, 'proxy');
+-%]
 command:
 
   snmpwalk -v2c -cpublic localhost sipwise:
     exit-status: 0
     stdout:
-    - "/::licIndex\\.1 = /"
-    - "/::licType\\.1 = /"
-    - "/::licValue\\.1 = /"
-    - "/::licOID\\.1 = /"
-    - "/::cnIndex\\.1 = /"
-    - "/::cnName\\.1 = /"
-    - "/::cnCpuTotal\\.1 = /"
-    - "/::cnAddressIndex\\.1\\.1 = /"
-    - "/::cnAddressIface\\.1\\.1 = /"
-    - "/::cnAddressType\\.1\\.1 = /"
-    - "/::cnAddress\\.1\\.1 = /"
-    - "/::cnRoleIndex\\.1\\.1 = /"
-    - "/::cnRole\\.1\\.1 = /"
+    - "/::licIndex\\.\\d = /"
+    - "/::licType\\.\\d = /"
+    - "/::licValue\\.\\d = /"
+    - "/::licOID\\.\\d = /"
+    - "/::cnIndex\\.\\d = /"
+    - "/::cnName\\.\\d = /"
+    - "/::cnCpuTotal\\.\\d = /"
+    - "/::cnAddressIndex\\.\\d\\.\\d = /"
+    - "/::cnAddressIface\\.\\d\\.\\d = /"
+    - "/::cnAddressType\\.\\d\\.\\d = /"
+    - "/::cnAddress\\.\\d\\.\\d = /"
+    - "/::cnRoleIndex\\.\\d\\.\\d = /"
+    - "/::cnRole\\.\\d\\.\\d = /"
     - "/::ngcpCollectiveCheckResult = /"
     - "/::ngcpCollectiveCheckOutput = /"
+[% IF is_mgmt -%]
     - "/::ngcpClusterProvSubs = /"
     - "/::ngcpClusterRegSubs = /"
     - "/::ngcpClusterRegDevs = /"
-    - "/::procIndex\\.1\\.1 = /"
-    - "/::procName\\.1\\.1 = /"
-    - "/::procStatus\\.1\\.1 = /"
-    - "/::procMonitoringStatus\\.1\\.1 = /"
-    - "/::procPid\\.1\\.1 = /"
-    - "/::procParentPid\\.1\\.1 = /"
-    - "/::procUptime\\.1\\.1 = /"
-    - "/::procChildren\\.1\\.1 = /"
-    - "/::procMemory\\.1\\.1 = /"
-    - "/::procMemoryTotal\\.1\\.1 = /"
-    - "/::procDataCollected\\.1\\.1 = /"
-    - "/::dbIndex\\.1\\.1 = /"
-    - "/::dbSlaveIORunning\\.1\\.1 = /"
-    - "/::dbSlaveIOLastError\\.1\\.1 = /"
-    - "/::dbSlaveIOLastErrorDesc\\.1\\.1 = /"
-    - "/::dbSlaveSQLRunning\\.1\\.1 = /"
-    - "/::dbSlaveSQLLastError\\.1\\.1 = /"
-    - "/::dbSlaveSQLLastErrorDesc\\.1\\.1 = /"
-    - "/::dbQueryRate\\.1\\.1 = /"
-    - "/::dbReplDelay\\.1\\.1 = /"
-    - "/::dbReplDiff\\.1\\.1 = /"
-    - "/::load1min\\.1 = /"
-    - "/::load5min\\.1 = /"
-    - "/::load15min\\.1 = /"
-    - "/::memTotal\\.1 = /"
-    - "/::memUsed\\.1 = /"
-    - "/::memFree\\.1 = /"
-    - "/::memShared\\.1 = /"
-    - "/::memCached\\.1 = /"
-    - "/::swapTotal\\.1 = /"
-    - "/::swapUsed\\.1 = /"
-    - "/::swapFree\\.1 = /"
-    - "/::fsIndex\\.1\\.1 = /"
-    - "/::fsMount\\.1\\.1 = /"
-    - "/::fsSize\\.1\\.1 = /"
-    - "/::fsUsed\\.1\\.1 = /"
-    - "/::hbStatusProc\\.1 = /"
-    - "/::hbStatusHost\\.1 = /"
-    - "/::hbStatusNode\\.1 = /"
-    - "/::mailQueue\\.1 = /"
-    - "/::asrCur\\.1 = /"
-    - "/::nerCur\\.1 = /"
-    - "/::ccCur\\.1 = /"
-    - "/::ccCur\\.1 = /"
-    - "/::emCur\\.1 = /"
-    - "/::dialogActiveCur\\.1 = /"
-    - "/::dialogLocalCur\\.1 = /"
-    - "/::dialogRelayCur\\.1 = /"
-    - "/::dialogIncomingCur\\.1 = /"
-    - "/::dialogOutgoingCur\\.1 = /"
+[% END -%]
+    - "/::procIndex\\.\\d\\.\\d = /"
+    - "/::procName\\.\\d\\.\\d = /"
+    - "/::procStatus\\.\\d\\.\\d = /"
+    - "/::procMonitoringStatus\\.\\d\\.\\d = /"
+    - "/::procPid\\.\\d\\.\\d = /"
+    - "/::procParentPid\\.\\d\\.\\d = /"
+    - "/::procUptime\\.\\d\\.\\d = /"
+    - "/::procChildren\\.\\d\\.\\d = /"
+    - "/::procMemory\\.\\d\\.\\d = /"
+    - "/::procMemoryTotal\\.\\d\\.\\d = /"
+    - "/::procDataCollected\\.\\d\\.\\d = /"
+    - "/::dbIndex\\.\\d\\.\\d = /"
+    - "/::dbSlaveIORunning\\.\\d\\.\\d = /"
+    - "/::dbSlaveIOLastError\\.\\d\\.\\d = /"
+    - "/::dbSlaveIOLastErrorDesc\\.\\d\\.\\d = /"
+    - "/::dbSlaveSQLRunning\\.\\d\\.\\d = /"
+    - "/::dbSlaveSQLLastError\\.\\d\\.\\d = /"
+    - "/::dbSlaveSQLLastErrorDesc\\.\\d\\.\\d = /"
+    - "/::dbQueryRate\\.\\d\\.\\d = /"
+    - "/::dbReplDelay\\.\\d\\.\\d = /"
+    - "/::dbReplDiff\\.\\d\\.\\d = /"
+    - "/::load\\dmin\\.\\d = /"
+    - "/::load5min\\.\\d = /"
+    - "/::load\\d5min\\.\\d = /"
+    - "/::memTotal\\.\\d = /"
+    - "/::memUsed\\.\\d = /"
+    - "/::memFree\\.\\d = /"
+    - "/::memShared\\.\\d = /"
+    - "/::memCached\\.\\d = /"
+    - "/::swapTotal\\.\\d = /"
+    - "/::swapUsed\\.\\d = /"
+    - "/::swapFree\\.\\d = /"
+    - "/::fsIndex\\.\\d\\.\\d = /"
+    - "/::fsMount\\.\\d\\.\\d = /"
+    - "/::fsSize\\.\\d\\.\\d = /"
+    - "/::fsUsed\\.\\d\\.\\d = /"
+    - "/::hbStatusProc\\.\\d = /"
+    - "/::hbStatusHost\\.\\d = /"
+    - "/::hbStatusNode\\.\\d = /"
+    - "/::mailQueue\\.\\d = /"
+[% IF is_mgmt -%]
+    - "/::asrCur\\.\\d = /"
+    - "/::nerCur\\.\\d = /"
+[% END -%]
+    - "/::ccCur\\.\\d = /"
+    - "/::ccCur\\.\\d = /"
+[% IF is_mgmt || is_proxy -%]
+    - "/::emCur\\.\\d = /"
+[% END -%]
+    - "/::dialogActiveCur\\.\\d = /"
+    - "/::dialogLocalCur\\.\\d = /"
+    - "/::dialogRelayCur\\.\\d = /"
+    - "/::dialogIncomingCur\\.\\d = /"
+    - "/::dialogOutgoingCur\\.\\d = /"
     stderr: []
     timeout: 10000