diff --git a/includes/definitions/sentry3.yaml b/includes/definitions/sentry3.yaml
index ef823b7c0c..9a220c3594 100644
--- a/includes/definitions/sentry3.yaml
+++ b/includes/definitions/sentry3.yaml
@@ -7,13 +7,5 @@ icon: servertech
 mib_dir:
     - sentry
 discovery:
-    -
-      sysDescr:
-        - Switched
-        - Smart
-      snmpget:
-        oid: serverTech.4.1.1.1.3.0
-        mib: Sentry3-MIB
-        mibdir: sentry
-        op: regex
-        value: '/[^\s]* [0-7]/'
+    - sysObjectId:
+        - .1.3.6.1.4.1.1718.3
diff --git a/includes/definitions/sentry4.yaml b/includes/definitions/sentry4.yaml
index 85199cabdc..9839a0d59e 100644
--- a/includes/definitions/sentry4.yaml
+++ b/includes/definitions/sentry4.yaml
@@ -7,13 +7,7 @@ icon: servertech
 mib_dir:
     - sentry
 discovery:
-    -
-      sysDescr:
-        - Switched
-        - Smart
-      snmpget:
-        oid: serverTech.4.1.1.1.3.0
-        mib: Sentry3-MIB
-        mibdir: sentry
-        op: regex
-        value: '/[^\s]* [^0-7]/'
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.1718.4
+
diff --git a/tests/snmpsim/sentry3_smart.snmprec b/tests/snmpsim/sentry3_smart.snmprec
index ceba57f8c4..e2c88e104b 100644
--- a/tests/snmpsim/sentry3_smart.snmprec
+++ b/tests/snmpsim/sentry3_smart.snmprec
@@ -1,2 +1,2 @@
-1.3.6.1.2.1.1.1.0|4|Sentry Smart Something
-1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 7
+1.3.6.1.2.1.1.1.0|4|Sentry Smart CDU
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1718.3
diff --git a/tests/snmpsim/sentry3_switched.snmprec b/tests/snmpsim/sentry3_switched.snmprec
index d0e19a01c5..a1aad1b1e9 100644
--- a/tests/snmpsim/sentry3_switched.snmprec
+++ b/tests/snmpsim/sentry3_switched.snmprec
@@ -1,3 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|Sentry Switched CDU
 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1718.3
-1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 7
diff --git a/tests/snmpsim/sentry4_smart.snmprec b/tests/snmpsim/sentry4_smart.snmprec
index 6072584daa..be9b286760 100644
--- a/tests/snmpsim/sentry4_smart.snmprec
+++ b/tests/snmpsim/sentry4_smart.snmprec
@@ -1,2 +1,3 @@
-1.3.6.1.2.1.1.1.0|4|Sentry Smart Something
+1.3.6.1.2.1.1.1.0|4|Sentry Smart PDU
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1718.4
 1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 8
diff --git a/tests/snmpsim/sentry4_switched.snmprec b/tests/snmpsim/sentry4_switched.snmprec
index 0bb5ec1425..20c4081372 100644
--- a/tests/snmpsim/sentry4_switched.snmprec
+++ b/tests/snmpsim/sentry4_switched.snmprec
@@ -1,2 +1,3 @@
-1.3.6.1.2.1.1.1.0|4|Sentry Switched Something
+1.3.6.1.2.1.1.1.0|4|Sentry Switched CDU
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1718.4
 1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 8