diff --git a/includes/definitions/jetdirect.yaml b/includes/definitions/jetdirect.yaml
index cf979a0454..f089ce2977 100644
--- a/includes/definitions/jetdirect.yaml
+++ b/includes/definitions/jetdirect.yaml
@@ -10,4 +10,9 @@ discovery_modules:
     toner: 1
 poller_modules:
     toner: 1
-
+discovery:
+    - sysDescr:
+        - JETDIRECT
+        - HP ETHERNET MULTI-ENVIRONMENT
+    - sysObjectId_regex:
+        - '/^.1.3.6.1.4.1.11.1$/'
diff --git a/includes/discovery/os/jetdirect.inc.php b/includes/discovery/os/jetdirect.inc.php
deleted file mode 100644
index 2a66f693d8..0000000000
--- a/includes/discovery/os/jetdirect.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('JETDIRECT', 'HP ETHERNET MULTI-ENVIRONMENT'))) {
-    $os = 'jetdirect';
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.11.1') && !starts_with($sysObjectId, '.1.3.6.1.4.1.11.10.2.1.3.25')) {
-    $os = 'jetdirect';
-}
diff --git a/includes/functions.php b/includes/functions.php
index a3024085c2..d80adb7b57 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -160,6 +160,10 @@ function checkDiscovery($array, $sysObjectId, $sysDescr)
             if (!preg_match_any($sysDescr, $value)) {
                 return false;
             }
+        } elseif ($key == 'sysObjectId_regex') {
+            if (!preg_match_any($sysObjectId, $value)) {
+                return false;
+            }
         }
     }