diff --git a/templates/915_service-snmp.yaml.tt2 b/templates/915_service-snmp.yaml.tt2
index c770195..83564aa 100644
--- a/templates/915_service-snmp.yaml.tt2
+++ b/templates/915_service-snmp.yaml.tt2
@@ -9,19 +9,19 @@ command:
   snmpwalk -v2c -cpublic localhost sipwise:
     exit-status: 0
     stdout:
-    - "/::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 = /"
+    - "/::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+ = /"
 [% IF snmpagent.trees.collective_check == 'yes' -%]
     - "/::ngcpCollectiveCheckResult = /"
     - "/::ngcpCollectiveCheckOutput = /"
@@ -31,57 +31,57 @@ command:
     - "/::ngcpClusterRegSubs = /"
     - "/::ngcpClusterRegDevs = /"
 [% 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 = /"
-    - "/::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 = /"
+    - "/::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+ = /"
+    - "/::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 -%]
-    - "/::sipAnswerSeizureRatio\\.\\d = /"
-    - "/::sipNetworkEfficiencyRatio\\.\\d = /"
+    - "/::sipAnswerSeizureRatio\\.\\d+ = /"
+    - "/::sipNetworkEfficiencyRatio\\.\\d+ = /"
 [% END -%]
 [% IF is_proxy -%]
-    - "/::sipConcurrentCalls\\.\\d = /"
-    - "/::sipDialogEarlyMedia\\.\\d = /"
-    - "/::sipDialogActive\\.\\d = /"
-    - "/::sipDialogLocal\\.\\d = /"
-    - "/::sipDialogRelay\\.\\d = /"
-    - "/::sipDialogIncoming\\.\\d = /"
-    - "/::sipDialogOutgoing\\.\\d = /"
+    - "/::sipConcurrentCalls\\.\\d+ = /"
+    - "/::sipDialogEarlyMedia\\.\\d+ = /"
+    - "/::sipDialogActive\\.\\d+ = /"
+    - "/::sipDialogLocal\\.\\d+ = /"
+    - "/::sipDialogRelay\\.\\d+ = /"
+    - "/::sipDialogIncoming\\.\\d+ = /"
+    - "/::sipDialogOutgoing\\.\\d+ = /"
 [% END -%]
     stderr: []
     timeout: 10000