diff --git a/README.md b/README.md
index ea219dbe8..3d041c307 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ net/shadowsocks -- Secure socks5 proxy
 net/siproxd -- Siproxd is a proxy daemon for the SIP protocol
 net/sslh -- sslh configuration front-end
 net/tayga -- Tayga NAT64
+net/turnserver -- The coturn STUN/TURN Server (development only)
 net/udpbroadcastrelay -- Control udpbroadcastrelay processes
 net/upnp -- Universal Plug and Play (UPnP IGD & PCP/NAT-PMP) Service
 net/vnstat -- Network traffic monitor
diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile
index dfe3b1ce6..8952e2a3f 100644
--- a/net/turnserver/Makefile
+++ b/net/turnserver/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		turnserver
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		0.1
+PLUGIN_DEVEL=		yes
 PLUGIN_COMMENT=		The coturn STUN/TURN Server
 PLUGIN_DEPENDS=		turnserver
 PLUGIN_MAINTAINER=	opnsense@moov.de
diff --git a/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/ACL/ACL.xml b/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/ACL/ACL.xml
index 2fa8a37a6..dfc800ea5 100644
--- a/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/ACL/ACL.xml
+++ b/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/ACL/ACL.xml
@@ -2,7 +2,7 @@
     <page-services-turnserver>
         <name>Services: Turnserver</name>
         <patterns>
-            <pattern>ui/turnserver/*</pattern>
+            <pattern>ui/turnserver</pattern>
             <pattern>api/turnserver/*</pattern>
         </patterns>
     </page-services-turnserver>
diff --git a/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Menu/Menu.xml b/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Menu/Menu.xml
index 8b40dc89a..4134d75c2 100644
--- a/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Menu/Menu.xml
+++ b/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
     <Services>
-        <Turnserver VisibleName="Turnserver" cssClass="fa fa-comment-o fa-fw" url="/ui/turnserver"/>
+        <Turnserver cssClass="fa fa-comment-o fa-fw" url="/ui/turnserver"/>
     </Services>
 </menu>
diff --git a/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Turnserver.xml b/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Turnserver.xml
index 1acae266f..9c0346aef 100644
--- a/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Turnserver.xml
+++ b/net/turnserver/src/opnsense/mvc/app/models/OPNsense/Turnserver/Turnserver.xml
@@ -5,11 +5,11 @@
     <items>
         <settings>
             <Enabled type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </Enabled>
             <ListenIP type="NetworkField">
-                <default>127.0.0.1</default>
+                <Default>127.0.0.1</Default>
                 <FieldSeparator>,</FieldSeparator>
                 <asList>Y</asList>
                 <Required>Y</Required>
@@ -27,12 +27,11 @@
                 <Required>Y</Required>
             </MaxPort>
             <TlsEnabled type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </TlsEnabled>
             <TlsCertificate type="CertificateField">
                 <Required>N</Required>
-                <Multiple>N</Multiple>
                 <ValidationMessage>Please select a valid certificate from the list.</ValidationMessage>
             </TlsCertificate>
             <TlsPort type="PortField">
@@ -40,7 +39,7 @@
                 <Required>Y</Required>
             </TlsPort>
             <UseAuthSecret type="BooleanField">
-                <default>1</default>
+                <Default>1</Default>
                 <Required>Y</Required>
             </UseAuthSecret>
             <StaticAuthSecret type="TextField">
@@ -54,39 +53,39 @@
                 <ValidationMessage>Should be a string between 1 and 128 characters.</ValidationMessage>
             </Realm>
             <FingerprintsEnabled type="BooleanField">
-                <default>1</default>
+                <Default>1</Default>
                 <Required>Y</Required>
             </FingerprintsEnabled>
             <UserQuota type="IntegerField">
-                <default>0</default>
+                <Default>0</Default>
                 <MinimumValue>0</MinimumValue>
                 <MaximumValue>1000000000</MaximumValue>
                 <ValidationMessage>Please specify a value between 0 and 1000000000.</ValidationMessage>
                 <Required>Y</Required>
             </UserQuota>
             <TotalQuota type="IntegerField">
-                <default>0</default>
+                <Default>0</Default>
                 <MinimumValue>0</MinimumValue>
                 <MaximumValue>1000000000</MaximumValue>
                 <ValidationMessage>Please specify a value between 0 and 1000000000.</ValidationMessage>
                 <Required>Y</Required>
             </TotalQuota>
             <StaleNonce type="IntegerField">
-                <default>600</default>
+                <Default>600</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>1000000000</MaximumValue>
                 <ValidationMessage>Please specify a value between 1 and 1000000000.</ValidationMessage>
                 <Required>Y</Required>
             </StaleNonce>
             <ChannelLifetime type="IntegerField">
-                <default>600</default>
+                <Default>600</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>1000000000</MaximumValue>
                 <ValidationMessage>Please specify a value between 1 and 1000000000.</ValidationMessage>
                 <Required>Y</Required>
             </ChannelLifetime>
             <PermissionLifetime type="IntegerField">
-                <default>300</default>
+                <Default>300</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>1000000000</MaximumValue>
                 <ValidationMessage>Please specify a value between 1 and 1000000000.</ValidationMessage>
diff --git a/net/turnserver/src/opnsense/scripts/OPNsense/Turnserver/setup.sh b/net/turnserver/src/opnsense/scripts/OPNsense/Turnserver/setup.sh
deleted file mode 100755
index 137843af5..000000000
--- a/net/turnserver/src/opnsense/scripts/OPNsense/Turnserver/setup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/usr/local/opnsense/scripts/OPNsense/Turnserver/export_certs.php > /dev/null 2>&1
-exit 0
diff --git a/net/turnserver/src/opnsense/service/conf/actions.d/actions_turnserver.conf b/net/turnserver/src/opnsense/service/conf/actions.d/actions_turnserver.conf
index 372e02aa3..358637c93 100644
--- a/net/turnserver/src/opnsense/service/conf/actions.d/actions_turnserver.conf
+++ b/net/turnserver/src/opnsense/service/conf/actions.d/actions_turnserver.conf
@@ -1,26 +1,26 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Turnserver/setup.sh; /usr/local/etc/rc.d/turnserver start
+command:/usr/local/etc/rc.d/turnserver start
 parameters:
 type:script
 description:Start Turnserver
 message:starting turnserver
 
 [stop]
-command:/usr/local/etc/rc.d/turnserver onestop
+command:/usr/local/etc/rc.d/turnserver stop
 parameters:
 type:script
 description:Stop Turnserver
 message:stopping turnserver
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Turnserver/setup.sh; /usr/local/etc/rc.d/turnserver restart
+command:/usr/local/etc/rc.d/turnserver restart
 parameters:
 type:script
 description:Restart Turnserver
 message:restarting turnserver
 
 [status]
-command:/usr/local/etc/rc.d/turnserver status || exit 0
+command:/usr/local/etc/rc.d/turnserver status; exit 0
 parameters:
 type:script_output
 message:requesting turnserver status
diff --git a/net/turnserver/src/opnsense/service/templates/OPNsense/Turnserver/rc.conf.d b/net/turnserver/src/opnsense/service/templates/OPNsense/Turnserver/rc.conf.d
index f292a0486..fdf9b7be4 100644
--- a/net/turnserver/src/opnsense/service/templates/OPNsense/Turnserver/rc.conf.d
+++ b/net/turnserver/src/opnsense/service/templates/OPNsense/Turnserver/rc.conf.d
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.turnserver.settings.Enabled') and OPNsense.turnserver.settings.Enabled|default("0") == "1" %}
-turnserver_enable=YES
+turnserver_enable="YES"
+turnserver_setup="/usr/local/opnsense/scripts/OPNsense/Turnserver/export_certs.php"
 {% else %}
-turnserver_enable=NO
+turnserver_enable="NO"
 {% endif %}