diff --git a/includes/definitions/aos.yaml b/includes/definitions/aos.yaml
index 0173a8e7cc..d018ab9b3e 100644
--- a/includes/definitions/aos.yaml
+++ b/includes/definitions/aos.yaml
@@ -7,3 +7,8 @@ ifname: 1
 over:
     - { graph: device_bits, text: 'Device Traffic' }
 icon: alcatellucent
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.6486.801.
+        - .1.3.6.1.4.1.6486.800.1.1.2.1.
+        - .1.3.6.1.4.1.6486.800.1.1.2.2.4. #OmniStack LS
diff --git a/includes/definitions/arubaos.yaml b/includes/definitions/arubaos.yaml
index 8058275b02..e66484bafc 100644
--- a/includes/definitions/arubaos.yaml
+++ b/includes/definitions/arubaos.yaml
@@ -8,9 +8,6 @@ over:
 poller_modules:
     aruba-controller: 1
 discovery:
-    - sysDescr:
-        - 'ArubaOS'
-    - 
-      sysDescr: 'AOS-W'
-      sysObjectId: '.1.3.6.1.4.1.6486.800'
-
+    - sysObjectId:
+        - .1.3.6.1.4.1.14823. #ArubaOS
+        - .1.3.6.1.4.1.6486.800.1.1.2.2.2. #AOS-W
diff --git a/includes/discovery/os/aos.inc.php b/includes/discovery/os/aos.inc.php
deleted file mode 100644
index 304b6af44a..0000000000
--- a/includes/discovery/os/aos.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// | Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010. | .1.3.6.1.4.1.6486.800.1.1.2.1.7.1.10 |
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.6486.800')) {
-    if (!str_contains($sysDescr, 'AOS-W')) {
-        $os = 'aos';
-    }
-} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.6486.801')) {
-    $os = 'aos';
-}
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 694629e4dc..a91d55d755 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -181,6 +181,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     {
         $this->checkOS('aos');
         $this->checkOS('aos', 'aos1');
+        $this->checkOS('aos', 'aos-omnistack');
     }
 
     public function testAosEmu2()
@@ -236,6 +237,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     public function testArubaos()
     {
         $this->checkOS('arubaos');
+        $this->checkOS('arubaos', 'arubaos-aosw');
     }
 
     public function testAsa()
diff --git a/tests/snmpsim/aos-omnistack.snmprec b/tests/snmpsim/aos-omnistack.snmprec
new file mode 100644
index 0000000000..cbd7f64906
--- /dev/null
+++ b/tests/snmpsim/aos-omnistack.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|OmniStack LS 6200
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.800.1.1.2.2.4.1.3
diff --git a/tests/snmpsim/aos.snmprec b/tests/snmpsim/aos.snmprec
index afad45906a..a66fb2733e 100644
--- a/tests/snmpsim/aos.snmprec
+++ b/tests/snmpsim/aos.snmprec
@@ -1,2 +1,2 @@
-1.3.6.1.2.1.1.1.0|4|AOS-W
-1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.801
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6900-X20 7.3.4.310.R02 Service Release, November 15, 2016.
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.801.1.1.2.1.10.1.1
diff --git a/tests/snmpsim/aos1.snmprec b/tests/snmpsim/aos1.snmprec
index 7bb8aecb72..839e6d56f4 100644
--- a/tests/snmpsim/aos1.snmprec
+++ b/tests/snmpsim/aos1.snmprec
@@ -1,2 +1,2 @@
-1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
-1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.801
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6450-P24 6.6.4.268.R01 Service Release, September 17, 2014.
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.800.1.1.2.1.12.1.6
diff --git a/tests/snmpsim/arubaos-aosw.snmprec b/tests/snmpsim/arubaos-aosw.snmprec
new file mode 100644
index 0000000000..035aa8c173
--- /dev/null
+++ b/tests/snmpsim/arubaos-aosw.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|AOS-W (MODEL: OAW-6000), Version 6.3.1.23 (56687)
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.800.1.1.2.2.2.1.1.4
diff --git a/tests/snmpsim/arubaos.snmprec b/tests/snmpsim/arubaos.snmprec
index f439b9e196..12d8806b7c 100644
--- a/tests/snmpsim/arubaos.snmprec
+++ b/tests/snmpsim/arubaos.snmprec
@@ -1 +1,2 @@
-1.3.6.1.2.1.1.1.0|4|ArubaOS
+1.3.6.1.2.1.1.1.0|4|ArubaOS Version 6.4.4.4-4.2.3.1
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14823.1.2.61