diff --git a/src/etc/inc/plugins.inc.d/miniupnpd.inc b/src/etc/inc/plugins.inc.d/miniupnpd.inc
index c654ee074..94c524f9b 100644
--- a/src/etc/inc/plugins.inc.d/miniupnpd.inc
+++ b/src/etc/inc/plugins.inc.d/miniupnpd.inc
@@ -28,8 +28,30 @@
 function miniupnpd_firewall($fw)
 {
     global $config;
+
     if (isset($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
         $fw->registerAnchor("miniupnpd/*", "rdr");
         $fw->registerAnchor("miniupnpd/*", "fw");
     }
 }
+
+function miniupnpd_services()
+{
+    global $config;
+
+    $services = array();
+
+    if (isset($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
+        $pconfig = array();
+        $pconfig['name'] = "miniupnpd";
+        $pconfig['description'] = gettext("UPnP Service");
+        $pconfig['description'] = gettext("UPnP Service");
+        $pconfig['php']['restart'] = array('upnp_stop', 'upnp_start');
+        $pconfig['php']['start'] = array('upnp_start');
+        $pconfig['php']['stop'] = array('upnp_stop');
+        $pconfig['pidfile'] = '/var/run/miniupnpd.pid';
+        $services[] = $pconfig;
+    }
+
+    return $services;
+}
diff --git a/src/etc/inc/plugins.inc.d/squid.inc b/src/etc/inc/plugins.inc.d/squid.inc
index 4fc24037a..84c75c18f 100644
--- a/src/etc/inc/plugins.inc.d/squid.inc
+++ b/src/etc/inc/plugins.inc.d/squid.inc
@@ -26,6 +26,26 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+function squid_services()
+{
+    global $config;
+
+    $services = array();
+
+    if (isset($config['OPNsense']['proxy']['general']['enabled']) && $config['OPNsense']['proxy']['general']['enabled'] == 1) {
+        $services[] = array(
+            'description' => gettext('Proxy server'),
+            'configd' => array(
+                'restart' => array('proxy restart'),
+                'start' => array('proxy start'),
+                'stop' => array('proxy stop'),
+            ),
+            'name' => 'squid',
+        );
+    }
+
+    return $services;
+}
 
 function squid_syslog()
 {
diff --git a/src/etc/inc/plugins.inc.d/suricata.inc b/src/etc/inc/plugins.inc.d/suricata.inc
index fea297aed..60b48db95 100644
--- a/src/etc/inc/plugins.inc.d/suricata.inc
+++ b/src/etc/inc/plugins.inc.d/suricata.inc
@@ -26,6 +26,26 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+function suricata_services()
+{
+    global $config;
+
+    $services = array();
+
+    if (isset($config['OPNsense']['IDS']['general']['enabled']) && $config['OPNsense']['IDS']['general']['enabled'] == 1) {
+        $services[] = array(
+            'description' => gettext('Intrusion Detection'),
+            'configd' => array(
+                'restart' => array('ids restart'),
+                'start' => array('ids start'),
+                'stop' => array('ids stop'),
+            ),
+            'name' => 'suricata',
+        );
+    }
+
+    return $services;
+}
 
 function suricata_syslog()
 {
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index fb9bd695d..edb205f7f 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2494,18 +2494,6 @@ function services_get()
         $services[] = $pconfig;
     }
 
-    if (isset($config['installedpackages']['miniupnpd']) && $config['installedpackages']['miniupnpd']['config'][0]['enable']) {
-        $pconfig = array();
-        $pconfig['name'] = "miniupnpd";
-        $pconfig['description'] = gettext("UPnP Service");
-        $pconfig['description'] = gettext("UPnP Service");
-        $pconfig['php']['restart'] = array('upnp_stop', 'upnp_start');
-        $pconfig['php']['start'] = array('upnp_start');
-        $pconfig['php']['stop'] = array('upnp_stop');
-        $pconfig['pidfile'] = '/var/run/miniupnpd.pid';
-        $services[] = $pconfig;
-    }
-
     if (isset($config['system']['ssh']['enabled'])) {
         $pconfig = array();
         $pconfig['name'] = 'sshd';
@@ -2524,30 +2512,6 @@ function services_get()
           $services[] = $pconfig;
     }
 
-    if (isset($config['OPNsense']['proxy']['general']['enabled']) && $config['OPNsense']['proxy']['general']['enabled'] == 1) {
-        $services[] = array(
-            'description' => gettext('Proxy server'),
-            'configd' => array(
-                'restart' => array('proxy restart'),
-                'start' => array('proxy start'),
-                'stop' => array('proxy stop'),
-            ),
-            'name' => 'squid',
-        );
-    }
-
-    if (isset($config['OPNsense']['IDS']['general']['enabled']) && $config['OPNsense']['IDS']['general']['enabled'] == 1) {
-        $services[] = array(
-            'description' => gettext('Intrusion Detection'),
-            'configd' => array(
-                'restart' => array('ids restart'),
-                'start' => array('ids start'),
-                'stop' => array('ids stop'),
-            ),
-            'name' => 'suricata',
-        );
-    }
-
     if (isset($config['OPNsense']['captiveportal']['zones']['zone'])) {
         $enabled = false;
         if (!empty($config['OPNsense']['captiveportal']['zones']['zone']['enabled'])) {