diff --git a/net/wireguard-go/Makefile b/net/wireguard-go/Makefile
index 9be4130ce..e2fda1061 100644
--- a/net/wireguard-go/Makefile
+++ b/net/wireguard-go/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		wireguard-go
 PLUGIN_VERSION=		1.13
-PLUGIN_REVISION=	7
+PLUGIN_REVISION=	8
 PLUGIN_COMMENT=		WireGuard VPN service Go implementation
 PLUGIN_CONFLICTS=	wireguard
 PLUGIN_OBSOLETE=	yes
diff --git a/net/wireguard-go/src/etc/inc/plugins.inc.d/wireguard.inc b/net/wireguard-go/src/etc/inc/plugins.inc.d/wireguard.inc
index cc1e49ee8..7cc6f8bc2 100644
--- a/net/wireguard-go/src/etc/inc/plugins.inc.d/wireguard.inc
+++ b/net/wireguard-go/src/etc/inc/plugins.inc.d/wireguard.inc
@@ -50,11 +50,6 @@ function wireguard_services()
         'name' => 'wireguard-go',
     ];
 
-    if (file_exists('/boot/modules/if_wg.ko') || file_exists('/boot/kernel/if_wg.ko')) {
-        $service['name'] = 'wireguard';
-        $service['nocheck'] = true;
-    }
-
     $services[] = $service;
 
     return $services;
@@ -89,14 +84,26 @@ function wireguard_xmlrpc_sync()
     $result['description'] = gettext('WireGuard');
     $result['services'] = ['wireguard-go'];
 
-    if (file_exists('/boot/modules/if_wg.ko') || file_exists('/boot/kernel/if_wg.ko')) {
-        $result['services'] = ['wireguard'];
-    }
-
     return [$result];
 }
 
 function wireguard_devices()
 {
-    return [['pattern' => '^wg', 'volatile' => true]];
+    $names = [];
+    foreach ((new OPNsense\Wireguard\Server())->servers->server->iterateItems() as $key => $node) {
+        if (!empty((string)$node->enabled)) {
+            $names[(string)$node->interface] = [
+                'descr' => sprintf('%s (WireGuard - %s)', (string)$node->interface, (string)$node->name),
+                'ifdescr' => (string)$node->name,
+                'name' => (string)$node->interface
+            ];
+        }
+    }
+    return [[
+        'configurable' => false,
+        'pattern' => '^wg',
+        'type' => 'wireguard',
+        'volatile' => true,
+        'names' => $names,
+    ]];
 }