diff --git a/includes/discovery/os/edgeos.inc.php b/includes/discovery/os/edgeos.inc.php
index add88a191e..54b3ecbd95 100644
--- a/includes/discovery/os/edgeos.inc.php
+++ b/includes/discovery/os/edgeos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^EdgeOS/', $sysDescr)) {
-        $os = 'edgeos';
-    }
+if (starts_with($sysDescr, 'EdgeOS')) {
+    $os = 'edgeos';
 }
diff --git a/includes/discovery/os/vyatta.inc.php b/includes/discovery/os/vyatta.inc.php
index ede2689a28..d3a8409f8f 100644
--- a/includes/discovery/os/vyatta.inc.php
+++ b/includes/discovery/os/vyatta.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Vyatta/', $sysDescr)) {
-        $os = 'vyatta';
-    }
+if (starts_with($sysDescr, 'Vyatta') && !str_contains($sysDescr, 'VyOS')) {
+    $os = 'vyatta';
 }
diff --git a/includes/discovery/os/vyos.inc.php b/includes/discovery/os/vyos.inc.php
index 1be20d27a5..937ebc794e 100644
--- a/includes/discovery/os/vyos.inc.php
+++ b/includes/discovery/os/vyos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os || $os == 'vyatta') {
-    if (preg_match('/^Vyatta VyOS/', $sysDescr) || preg_match('/^VyOS/i', $sysDescr)) {
-        $os = 'vyos';
-    }
+if (starts_with($sysDescr, 'Vyatta VyOS') || starts_with($sysDescr, 'VyOS', true)) {
+    $os = 'vyos';
 }
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 0368de8000..ff7796e01d 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -126,6 +126,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('eatonups', 'Eaton 5PX 2000');
     }
 
+    public function testEdgeos()
+    {
+        $this->checkOS('edgeos', 'EdgeOS');
+    }
+
     public function testEndian()
     {
         $this->checkOS('endian', 'Linux endian');
@@ -210,6 +215,18 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('unifi', 'Linux', '.1.3.6.1.4.1.10002.1', $mockSnmp);
     }
 
+    public function testVyatta()
+    {
+        $this->checkOS('vyatta', 'Vyatta');
+    }
+
+    public function testVyos()
+    {
+        $this->checkOS('vyos', 'Vyatta VyOS');
+        $this->checkOS('vyos', 'VyOS');
+        $this->checkOS('vyos', 'vyos');
+    }
+
     public function testZxr10()
     {
         $this->checkOS('zxr10', 'ZTE Ethernet Switch  ZXR10 5250-52TM-H, Version: V2.05.11B23');