diff --git a/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc b/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc
index 43a491fa..d7d800b2 100644
--- a/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc
+++ b/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc
@@ -1,20 +1,24 @@
 <?php
 function defguardgateway_services()
 {
+    global $config;
+
     $services = [];
 
     $pidfile = (string) (new OPNsense\DefguardGateway\DefguardGateway())->general->PidFile;
 
-    $services[] = [
-        "description" => "Defguard Gateway",
-        "configd" => [
-            "start" => ["defguard_gateway start"],
-            "restart" => ["defguard_gateway restart"],
-            "stop" => ["defguard_gateway stop"],
-        ],
-        "pidfile" => empty($pidfile) ? "/var/run/defguard_gateway.pid" : $pidfile,
-        "name" => "defguard_gateway",
-    ];
+    if (isset($config['OPNsense']['defguardgateway']['general']['enabled']) && $config['OPNsense']['defguardgateway']['general']['enabled'] == 1) {
+        $services[] = [
+            "description" => "Defguard Gateway",
+            "configd" => [
+                "start" => ["defguardgateway start"],
+                "restart" => ["defguardgateway restart"],
+                "stop" => ["defguardgateway stop"],
+            ],
+            "pidfile" => empty($pidfile) ? "/var/run/defguard_gateway.pid" : $pidfile,
+            "name" => "defguardgateway",
+        ];
+    }
 
     return $services;
 }
diff --git a/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/ACL/ACL.xml b/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/ACL/ACL.xml
new file mode 100644
index 00000000..4db5838b
--- /dev/null
+++ b/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/ACL/ACL.xml
@@ -0,0 +1,9 @@
+<acl>
+   <page-services-defguardgateway>
+      <name>Services: Defguard Gateway</name>
+      <patterns>
+         <pattern>ui/defguardgateway/*</pattern>
+         <pattern>api/defguardgateway/*</pattern>
+      </patterns>
+   </page-services-defguardgateway>
+</acl>
diff --git a/opnsense/src/opnsense/service/conf/actions.d/actions_defguard_gateway.conf b/opnsense/src/opnsense/service/conf/actions.d/actions_defguardgateway.conf
similarity index 100%
rename from opnsense/src/opnsense/service/conf/actions.d/actions_defguard_gateway.conf
rename to opnsense/src/opnsense/service/conf/actions.d/actions_defguardgateway.conf