diff --git a/includes/wireguard.php b/includes/wireguard.php
index 4c4d838d..86665a48 100644
--- a/includes/wireguard.php
+++ b/includes/wireguard.php
@@ -14,13 +14,13 @@ function DisplayWireGuardConfig()
             SaveWireGuardConfig($status);
         } elseif (isset($_POST['startwg'])) {
             $status->addMessage('Attempting to start WireGuard', 'info');
-            exec('sudo /usr/bin/wg-quick up wg0', $return);
+            exec('sudo /bin/systemctl start wg-quick@wg0', $return);
             foreach ($return as $line) {
                 $status->addMessage($line, 'info');
             }
         } elseif (isset($_POST['stopwg'])) {
             $status->addMessage('Attempting to stop WireGuard', 'info');
-            exec('sudo /usr/bin/wg-quick down wg0', $return);
+            exec('sudo /bin/systemctl stop wg-quick@wg0', $return);
             foreach ($return as $line) {
                 $status->addMessage($line, 'info');
             }
diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers
index b05be96a..9aded5a3 100644
--- a/installers/raspap.sudoers
+++ b/installers/raspap.sudoers
@@ -46,9 +46,7 @@ www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wgdata /etc/wireguard/*.conf
 www-data ALL=(ALL) NOPASSWD:/bin/mv /tmp/wg-*.key /etc/wireguard/wg-*.key
 www-data ALL=(ALL) NOPASSWD:/etc/raspap/adblock/update_blocklist.sh
 www-data ALL=(ALL) NOPASSWD:/usr/bin/tee /tmp/wireguard.log
-www-data ALL=(ALL) NOPASSWD:/bin/systemctl status wg-quick@wg0
-www-data ALL=(ALL) NOPASSWD:/usr/bin/wg-quick up wg0
-www-data ALL=(ALL) NOPASSWD:/usr/bin/wg-quick down wg0
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl * wg-quick@wg0
 www-data ALL=(ALL) NOPASSWD:/usr/bin/wg
 www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wireguard/*.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wireguard/wg-*.key