diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
new file mode 100644
index 000000000..b995e68c9
--- /dev/null
+++ b/security/tailscale/Makefile
@@ -0,0 +1,8 @@
+PLUGIN_NAME=       tailscale
+PLUGIN_VERSION=    1.0.d
+PLUGIN_DEVEL=      yes
+PLUGIN_COMMENT=    Tailscale makes creating software-defined networks easy
+PLUGIN_DEPENDS=    tailscale
+PLUGIN_MAINTAINER= sam@sheridan.co.uk
+
+.include "../../Mk/plugins.mk"
diff --git a/security/tailscale/pkg-descr b/security/tailscale/pkg-descr
new file mode 100644
index 000000000..9befef3b6
--- /dev/null
+++ b/security/tailscale/pkg-descr
@@ -0,0 +1,11 @@
+Tailscale is a mesh VPN alternative, based on WireGuard, that connects your
+computers, databases, and services together securely without any proxies.
+
+https://tailscale.com/
+
+Plugin Changelog
+================
+
+1.0
+
+* initial development release
diff --git a/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc b/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc
new file mode 100644
index 000000000..dc1bf6b0b
--- /dev/null
+++ b/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Sheridan Computers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function tailscale_enabled()
+{
+    return !empty((string)(new \OPNsense\Tailscale\Settings())->enabled);
+}
+
+function tailscale_services()
+{
+    $services = [];
+
+    if (!tailscale_enabled()) {
+        return $services;
+    }
+
+    $services[] = [
+        'description' => gettext('Tailscale'),
+        'pidfile' => '/var/run/tailscaled.pid',
+        'configd' => [
+            'restart' => ['tailscale restart'],
+            'start' => ['tailscale start'],
+            'stop' => ['tailscale stop'],
+        ],
+        'name' => 'tailscale',
+    ]; 
+
+    return $services;
+}
+
+function tailscale_devices()
+{
+    return [[
+        'pattern' => '^tailscale0$',
+        'configurable' => false,
+        'spoofmac' => false,
+        'volatile' => true,
+    ]];
+}
+
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php
new file mode 100644
index 000000000..0161b75b6
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Sheridan Computers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Backend;
+
+class AuthenticationController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelName = 'authentication';
+    protected static $internalModelClass = '\OPNsense\Tailscale\Authentication';
+}
+
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php
new file mode 100644
index 000000000..eece38360
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Sheridan Computers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale\Api;
+
+use OPNsense\Base\ApiMutableServiceControllerBase;
+use OPNsense\Core\Backend;
+
+/**
+ * Class ServiceController
+ * @package OPNsense\Tailscale
+ */
+class ServiceController extends ApiMutableServiceControllerBase
+{
+    protected static $internalServiceClass = '\OPNsense\Tailscale\Settings';
+    protected static $internalServiceEnabled = 'enabled';
+    protected static $internalServiceTemplate = 'OPNsense/Tailscale';
+    protected static $internalServiceName = 'tailscale';
+}
+
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php
new file mode 100644
index 000000000..49f3b50b4
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Sheridan Computers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Backend;
+
+class SettingsController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelName = 'settings';
+    protected static $internalModelClass = '\OPNsense\Tailscale\Settings';
+
+    public function searchSubnetAction()
+    {
+        return $this->searchBase("subnets.subnet4", null, "subnet");
+    }
+    public function setSubnetAction($uuid)
+    {
+        return $this->setBase("subnet4", "subnets.subnet4", $uuid);
+    }
+    public function addSubnetAction()
+    {
+        return $this->addBase("subnet4", "subnets.subnet4");
+    }
+
+    public function getSubnetAction($uuid = null)
+    {
+        return $this->getBase("subnet4", "subnets.subnet4", $uuid);
+    }
+
+    public function delSubnetAction($uuid)
+    {
+        return $this->delBase("subnets.subnet4", $uuid);
+    }
+
+    public function reloadAction()
+    {
+        $mdl = $this->getModel();
+	    $enabled = $mdl->enabled->__toString() === '1';
+   	    $response = $this->toggleTailScaleService($enabled);
+        return ['result ' => $response];
+    }
+
+    private function toggleTailscaleService($enabled)
+    {
+        $backend = new Backend();
+        $backend->configdRun('template reload OPNsense/Tailscale');
+        $action = $enabled ? 'start' : 'stop';
+        return trim($backend->configdRun('tailscale ' . $action));
+    }
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php
new file mode 100644
index 000000000..f3688ac9c
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Sheridan Computers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Backend;
+
+class StatusController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelName = 'Tailscale';
+    protected static $internalModelClass = '\OPNsense\Tailscale\Status';
+
+    public function statusAction()
+    {
+        $response = json_decode(trim((new Backend())->configdRun('tailscale tailscale-status')), true);
+        if ($response !== null) {
+            return $response;
+        }
+    	return ['error' => 'Unable to determine Tailscale status, is the service running?'];
+    }
+
+    public function ipAction()
+    {
+        $response = trim((new Backend())->configdRun('tailscale tailscale-ip'));
+    	return ['result' => $response];
+    }
+
+    public function netAction()
+    {
+        $response = trim((new Backend())->configdRun('tailscale tailscale-netcheck'));
+    	return ['result' => $response];
+    }
+
+    private function isJson($string) {
+        return is_string($string)
+            && (is_object(json_decode($string))
+            || is_array(json_decode($string)));
+    }
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/AuthenticationController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/AuthenticationController.php
new file mode 100644
index 000000000..98b9397b2
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/AuthenticationController.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Sheridan Computers
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale;
+
+class AuthenticationController extends \OPNsense\Base\IndexController
+{
+    public function indexAction()
+    {
+        $this->view->pick('OPNsense/Tailscale/authentication');
+        $this->view->authenticationForm = $this->getForm('authentication');
+    }
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/SettingsController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/SettingsController.php
new file mode 100644
index 000000000..0170af957
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/SettingsController.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Sheridan Computers
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale;
+
+class SettingsController extends \OPNsense\Base\IndexController
+{
+    public function indexAction()
+    {
+        $this->view->pick('OPNsense/Tailscale/settings');
+        $this->view->settingsForm = $this->getForm('settings');
+        $this->view->formDialogSubnet = $this->getForm("dialogSubnet4");
+    }
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/StatusController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/StatusController.php
new file mode 100644
index 000000000..707b41dd3
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/StatusController.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Sheridan Computers
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale;
+
+class StatusController extends \OPNsense\Base\IndexController
+{
+    public function indexAction()
+    {
+        $this->view->pick('OPNsense/Tailscale/status');
+    }
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml
new file mode 100644
index 000000000..b2bcae8b3
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml
@@ -0,0 +1,14 @@
+<form>
+    <field>
+        <id>authentication.loginServer</id>
+        <label>Login Server</label>
+        <type>text</type>
+        <help>Base URL of login (control) server.</help>
+    </field>
+    <field>
+        <id>authentication.preAuthKey</id>
+        <label>Pre-authentication Key</label>
+        <type>text</type>
+        <help>Use a non-reusable auth key and disable expiration</help>
+    </field>
+</form>
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/dialogSubnet4.xml b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/dialogSubnet4.xml
new file mode 100644
index 000000000..ce35d9f3d
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/dialogSubnet4.xml
@@ -0,0 +1,14 @@
+<form>
+    <field>
+        <id>subnet4.subnet</id>
+        <label>Subnet</label>
+        <type>text</type>
+        <help>Subnet to use, should be large enough to hold the specified pools and reservations</help>
+    </field>
+    <field>
+        <id>subnet4.description</id>
+        <label>Description</label>
+        <type>text</type>
+        <help>You may enter a description here for your reference (not parsed).</help>
+    </field>
+</form>
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/settings.xml b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/settings.xml
new file mode 100644
index 000000000..6b35707ae
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/settings.xml
@@ -0,0 +1,32 @@
+<form>
+    <field>
+        <id>settings.enabled</id>
+        <label>Enabled</label>
+        <type>checkbox</type>
+        <help>This will activate the Tailscale service.</help>
+    </field>
+    <field>
+        <id>settings.listenPort</id>
+        <label>Listen Port</label>
+	<type>text</type>
+        <help>UDP port to listen on for Wireguard and peer-to-peer traffic.</help>
+    </field>
+    <field>
+        <id>settings.acceptDNS</id>
+        <label>Accept DNS</label>
+        <type>checkbox</type>
+        <help>Accept DNS configuration from the control server.</help>
+    </field>
+    <field>
+        <id>settings.advertiseExitNode</id>
+        <label>Advertise Exit Node</label>
+        <type>checkbox</type>
+        <help>Offer to be an exit node for outbound internet traffic from the Tailscale network.</help>
+    </field>
+    <field>
+        <id>settings.acceptSubnetRoutes</id>
+        <label>Accept Subnet Routes</label>
+        <type>checkbox</type>
+        <help>Accept subnet routes that other nodes advertise.</help>
+    </field>
+</form>
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/ACL/ACL.xml b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/ACL/ACL.xml
new file mode 100644
index 000000000..d0f6a9138
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/ACL/ACL.xml
@@ -0,0 +1,9 @@
+<acl>
+    <page-tailscale-config>
+        <name>Tailscale</name>
+        <patterns>
+            <pattern>ui/tailscale/*</pattern>
+            <pattern>api/tailscale/*</pattern>
+        </patterns>
+    </page-tailscale-config>
+</acl>
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.php b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.php
new file mode 100644
index 000000000..eb9ee4d7f
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Sheridan Computers
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale;
+
+use OPNsense\Base\BaseModel;
+
+class Authentication extends BaseModel
+{
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml
new file mode 100644
index 000000000..358995b1a
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml
@@ -0,0 +1,14 @@
+<model>
+    <mount>//OPNsense/tailscale/authentication</mount>
+    <description>Tailscale authentication settings</description>
+    <items>
+        <loginServer type="UrlField">
+            <default>https://controlplane.tailscale.com</default>
+            <Required>Y</Required>
+            <ValidationMessage>Please enter a valid URL</ValidationMessage>
+        </loginServer>
+        <preAuthKey type="TextField">
+            <Required>Y</Required>
+        </preAuthKey>
+    </items>
+</model>
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Menu/Menu.xml b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Menu/Menu.xml
new file mode 100644
index 000000000..b28d1794f
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Menu/Menu.xml
@@ -0,0 +1,9 @@
+<menu>
+    <VPN>
+      <Tailscale cssClass="fa fa-lock fa-fw">
+        <Authentication order="1" url="/ui/tailscale/authentication"/>
+        <Settings order="2" url="/ui/tailscale/settings"/>
+        <Status order="3" url="/ui/tailscale/status"/>
+      </Tailscale>
+    </VPN>
+</menu>
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Settings.php b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Settings.php
new file mode 100644
index 000000000..791f600e2
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Settings.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Sheridan Computers
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale;
+
+use OPNsense\Base\BaseModel;
+
+class Settings extends BaseModel
+{
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Settings.xml b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Settings.xml
new file mode 100644
index 000000000..f232346c8
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Settings.xml
@@ -0,0 +1,37 @@
+<model>
+    <mount>//OPNsense/tailscale/settings</mount>
+    <description>Tailscale general settings</description>
+    <items>
+        <enabled type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </enabled>
+        <listenPort type="PortField">
+            <default>41641</default>
+            <Required>Y</Required>
+        </listenPort>
+        <acceptDNS type="BooleanField">
+            <default>1</default>
+            <Required>Y</Required>
+        </acceptDNS>
+        <advertiseExitNode type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </advertiseExitNode>
+        <acceptSubnetRoutes type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </acceptSubnetRoutes>
+        <subnets>
+            <subnet4 type="ArrayField">
+                <subnet type="NetworkField">
+                    <NetMaskRequired>Y</NetMaskRequired>
+                    <AddressFamily>ipv4</AddressFamily>
+                    <Strict>Y</Strict>
+                    <Required>Y</Required>
+                </subnet>
+                <description type="DescriptionField"/>
+            </subnet4>
+        </subnets>
+    </items>
+</model>
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Status.php b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Status.php
new file mode 100644
index 000000000..b70a04b95
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Status.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Sheridan Computers
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Tailscale;
+
+use OPNsense\Base\BaseModel;
+
+class Status extends BaseModel
+{
+}
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Status.xml b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Status.xml
new file mode 100644
index 000000000..dfc842fce
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Status.xml
@@ -0,0 +1,6 @@
+<model>
+    <mount>//OPNsense/tailscale/status</mount>
+    <description>Tailscale status settings</description>
+    <items>
+    </items>
+</model>
diff --git a/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/authentication.volt b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/authentication.volt
new file mode 100644
index 000000000..52cb55b6a
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/authentication.volt
@@ -0,0 +1,39 @@
+<script type="text/javascript">
+    $( document ).ready(function() {
+        mapDataToFormUI({'frmAuthentication':"/api/tailscale/authentication/get"}).done(function(data) {
+            updateServiceControlUI('tailscale');
+        });
+
+        $("#reconfigureAct").SimpleActionButton({
+            onPreAction: function() {
+                const dfObj = new $.Deferred();
+                saveFormToEndpoint("/api/tailscale/authentication/set", 'frmAuthentication', function () { dfObj.resolve(); }, true, function () { dfObj.reject(); });
+                return dfObj;
+            },
+                onAction: function(data, status) {
+                updateServiceControlUI('tailscale');
+            }
+        });
+
+    });
+</script>
+<div class="content-box">
+    {{ partial("layout_partials/base_form",['fields':authenticationForm,'id':'frmAuthentication']) }}
+</div>
+<section class="page-content-main">
+    <div class="content-box">
+        <div class="col-md-12">
+            <br/>
+            <div id="tailscaleChangeMessage" class="alert alert-info" style="display: none" role="alert">
+                {{ lang._('After changing settings, please remember to apply them') }}
+            </div>
+            <button class="btn btn-primary" id="reconfigureAct"
+                    data-endpoint='/api/tailscale/service/reconfigure'
+                    data-label="{{ lang._('Apply') }}"
+                    data-error-title="{{ lang._('Error reconfiguring Tailscale') }}"
+                    type="button"
+            ></button>
+            <br/><br/>
+        </div>
+    </div>
+</section>
diff --git a/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/settings.volt b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/settings.volt
new file mode 100644
index 000000000..aee1bd69f
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/settings.volt
@@ -0,0 +1,75 @@
+<script type="text/javascript">
+    $( document ).ready(function() {
+        mapDataToFormUI({'frmSettings':"/api/tailscale/settings/get"}).done(function(data) {
+            updateServiceControlUI('tailscale');
+        });
+
+        $("#grid-subnets").UIBootgrid(
+            {   search:'/api/tailscale/settings/search_subnet',
+                get:'/api/tailscale/settings/get_subnet/',
+                set:'/api/tailscale/settings/set_subnet/',
+                add:'/api/tailscale/settings/add_subnet/',
+                del:'/api/tailscale/settings/del_subnet/'
+            }
+        );
+
+        // link save button to API set action
+        $("#reconfigureAct").SimpleActionButton({
+            onPreAction: function() {
+                const dfObj = new $.Deferred();
+                saveFormToEndpoint("/api/tailscale/settings/set", 'frmSettings', function () { dfObj.resolve(); }, true, function () { dfObj.reject(); });
+                return dfObj;
+            },
+            onAction: function(data, status) {
+                updateServiceControlUI('tailscale');
+            }
+        });
+    });
+</script>
+<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
+    <li class="active"><a data-toggle="tab" href="#settings" id="tab_settings">{{ lang._('Settings') }}</a></li>
+    <li><a data-toggle="tab" href="#subnets" id="tab_subnets"> {{ lang._('Advertised Routes') }} </a></li>
+</ul>
+<div class="tab-content content-box">
+    <div id="settings"  class="tab-pane fade in active">
+        {{ partial("layout_partials/base_form",['fields':settingsForm,'id':'frmSettings'])}}
+    </div>
+    <div id="subnets" class="tab-pane fade in">
+        <table id="grid-subnets" class="table table-condensed table-hover table-striped" data-editDialog="DialogSubnet" data-editAlert="tailscaleChangeMessage">
+            <thead>
+                <tr>
+                  <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
+                  <th data-column-id="subnet" data-type="string">{{ lang._('Subnet') }}</th>
+                  <th data-column-id="description" data-type="string">{{ lang._('Description') }}</th>
+                  <th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td></td>
+                    <td>
+                        <button data-action="add" type="button" class="btn btn-xs btn-primary"><span class="fa fa-fw fa-plus"></span></button>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
+<section class="page-content-main">
+    <div class="content-box">
+        <div class="col-md-12">
+            <br/>
+            <button class="btn btn-primary" id="reconfigureAct"
+                data-endpoint='/api/tailscale/service/reconfigure'
+                data-label="{{ lang._('Apply') }}"
+                data-error-title="{{ lang._('Error reconfiguring Tailscale') }}"
+                type="button"
+            ></button>
+            <br/><br/>
+        </div>
+    </div>
+</section>
+
+{{ partial("layout_partials/base_dialog",['fields':formDialogSubnet,'id':'DialogSubnet','label':lang._('Edit Subnet')])}}
diff --git a/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt
new file mode 100644
index 000000000..b911f1393
--- /dev/null
+++ b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt
@@ -0,0 +1,132 @@
+<script>
+    $(document).ready(function() {
+        function nl2br (str, is_xhtml) {
+            if (typeof str === 'undefined' || str === null) {
+                return '';
+            }
+            var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';
+            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
+        }
+
+
+	function updateNetInfo() {
+            ajaxGet(url = "/api/tailscale/status/net/", sendData={},
+                callback = function (data, status) {
+                    if (status == "success") {
+                        if (data.result) {
+                            var html = nl2br(data.result);
+                            html = html.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;');
+			    $('#net_info').html(html);
+                        }
+                    } else {
+                        $('#net_info').html('Error');
+                    }
+                }
+            );
+        }
+
+        function updatePeerInfo(peers) {
+            $.each(peers, function(peer, data) {
+                let tailscaleIp = '';
+                if (data.TailscaleIPs !== null && data.TailscaleIPs !== undefined) {
+                    tailscaleIp = data.TailscaleIPs.join(', '); 
+
+                    console.log(tailscaleIp);
+                } 
+
+                let row = '<tr><td>' + data.HostName;
+                row += '</td><td>' + tailscaleIp;
+                row += '</td><td>' + data.LastSeen;
+                row += '</td><td>' + data.OS;
+                row += '</td></tr>';
+
+                $('#peerInfo > tbody').append(row);
+            });
+        }
+
+	
+        function updateStatusInfo() {
+            ajaxGet(url = "/api/tailscale/status/status/", sendData={},
+                callback = function (data, status) {
+                    $('#statusList > tbody').empty();
+                    $('#statusList > thead').hide();
+                    if (status == "success") {
+                        $('#statusList > thead').show();
+
+                        let skipKeys = [
+                            'CertDomains',
+                            'ClientVersion',
+                            'CurrentTailnet', 
+                            'Health',
+                            'Self', 
+                            'User'
+                        ];
+
+                        $.each(data, function (key, value) {
+                            if (skipKeys.includes(key)) {
+                                return true;
+                            }
+
+                            if (key === 'Peer') {
+                                updatePeerInfo(data.Peer);
+                                return true;
+                            }
+
+                            $('#statusList > tbody').append('<tr><td>' + key + '</td>' +
+                            '<td>' + value + '</td></tr>');
+                        });
+                    } else {
+                        $('#statusList > tbody').append('<tr><td colspan=2>Unable to fetch status, is Tailscale running?</td></tr>');
+                    }
+                }
+            );
+        }
+
+
+        updateNetInfo();
+        updateStatusInfo();
+
+    });
+</script>
+
+<!-- Navigation bar -->
+<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
+    <li class="active"><a data-toggle="tab" id="tab_general" href="#general">{{ lang._('General') }}</a></li>
+    <li><a data-toggle="tab" id="tab_peers" href="#peers">{{ lang._('Peers') }}</a></li>
+    <li><a data-toggle="tab" id="tab_net_info" href="#net_info">{{ lang._('Net Check') }}</a></li>
+</ul>
+
+<div class="tab-content content-box tab-content">
+    <div id="general" class="tab-pane fade in active">
+        <div id="status_info">
+            <table id="statusList" class="table table-striped table-condensed table-responsive">
+                <thead>
+                    <tr>
+                        <th>{{ lang._('Name') }}</th>
+                        <th>{{ lang._('Value') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div id="peers" class="tab-pane fade in">
+        <table id="peerInfo" class="table table-striped table-condensed table-responsive">
+            <thead>
+                <tr>
+                    <th>{{ lang._('Name') }}</th>
+                    <th>{{ lang._('Tailscale IPs') }}</th>
+                    <th>{{ lang._('Last Seen') }}</th>
+                    <th>{{ lang._('OS') }}</th>
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
+        </table>
+    </div>
+
+    <div id="net_info" class="tab-pane fade in">
+    </div>
+</div>
diff --git a/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf b/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf
new file mode 100644
index 000000000..e5d6e3b3d
--- /dev/null
+++ b/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf
@@ -0,0 +1,47 @@
+[start]
+command:/usr/local/etc/rc.d/tailscaled start
+type: script
+message: starting tailscale service
+
+[stop]
+command:/usr/local/etc/rc.d/tailscaled stop; exit 0
+type: script
+message: stopping tailscale service
+
+[status]
+command:/usr/local/etc/rc.d/tailscaled status; exit 0
+type: script_output
+message: tailscaled status
+
+[restart]
+command:/usr/local/etc/rc.d/tailscaled restart
+type: script
+message: restarting tailscale services
+
+[reload]
+command:/usr/local/etc/rc.d/tailscaled reload
+type: script
+message: reload tailscale configuration
+
+[tailscale-status]
+command:/usr/local/bin/tailscale status --json; exit 0
+type:script_output
+message: request tailscale status
+
+[tailscale-ip]
+command:/usr/local/bin/tailscale ip; exit 0
+type:script_output
+message: request tailscale ip
+
+[tailscale-version]
+command:/usr/local/bin/tailscale version; exit 0
+type:script_output
+message: request tailscale version
+
+[tailscale-netcheck]
+command:/usr/local/bin/tailscale netcheck; exit 0
+type:script_output
+message: request tailscale netcheck
+
+
+
diff --git a/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/+TARGETS b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/+TARGETS
new file mode 100644
index 000000000..e9380f1c2
--- /dev/null
+++ b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/+TARGETS
@@ -0,0 +1 @@
+rc.conf.d:/etc/rc.conf.d/tailscaled
diff --git a/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d
new file mode 100644
index 000000000..6713fa87e
--- /dev/null
+++ b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d
@@ -0,0 +1,49 @@
+# DO NOT EDIT
+# THIS FILE IS AUTOMATICALLY GENERATED - ANY CHANGES WILL BE OVERWRITTEN
+#
+{%  if not helpers.empty('OPNsense.tailscale.settings.enabled')  %}
+tailscaled_enable="YES"
+# Uncommenting the below breaks being able to access subnets 
+# see - https://github.com/tailscale/tailscale/issues/5573#issuecomment-1584695981 
+# tailscaled_env="TS_DEBUG_NETSTACK_SUBNETS=0"
+{%    if helpers.exists('OPNsense.tailscale.settings.listenPort') %}
+tailscaled_port="{{ OPNsense.tailscale.settings.listenPort }}"
+{%    endif %}
+{%    set up_args = [] %}
+{%    if helpers.exists('OPNsense.tailscale.settings.advertiseExitNode') and OPNsense.tailscale.settings.advertiseExitNode|default("0") == "1" %}
+{%      do up_args.append("--advertise-exit-node") %}
+{%    else %}
+{%      do up_args.append("--advertise-exit-node=false") %}
+{%    endif %}
+{%    if helpers.exists('OPNsense.tailscale.settings.acceptSubnetRoutes') and OPNsense.tailscale.settings.acceptSubnetRoutes|default("0") == "1" %}
+{%      do up_args.append("--accept-routes") %}
+{%    else %}
+{%      do up_args.append("--accept-routes=false") %}
+{%    endif %}
+{%    if helpers.exists('OPNsense.tailscale.settings.acceptDNS') and OPNsense.tailscale.settings.acceptDNS|default("0") == "1" %}
+{%      do up_args.append("--accept-dns") %}
+{%    else %}
+{%      do up_args.append("--accept-dns=false") %}
+{%    endif %}
+{%    if helpers.exists('OPNsense.tailscale.authentication.loginServer') %}
+{%      do up_args.append("--login-server=" + OPNsense.tailscale.authentication.loginServer) %}
+{%    endif %}
+{%    if helpers.exists('OPNsense.tailscale.authentication.preAuthKey') %}
+{%      do up_args.append("--auth-key=" + OPNsense.tailscale.authentication.preAuthKey) %}
+{%    endif %}
+{#  loop through subnets to build list #}
+{%    if helpers.exists('OPNsense.tailscale.settings.subnets.subnet4') %}
+{%      set subnets = [] %}
+{%      for subnet_list in helpers.toList('OPNsense.tailscale.settings.subnets.subnet4') %}
+{%        do subnets.append(subnet_list.subnet) %}
+{%      endfor %}
+{%      set subnetString = subnets|join(',') %}
+{%      do up_args.append("--advertise-routes=" + subnetString) %}
+{%    else %}
+{%      do up_args.append("--advertise-routes=") %}
+{%    endif %}
+tailscaled_up_args="{{ up_args|join(' ') }}"
+{%  else %}
+tailscaled_enable=NO
+{%  endif %}
+