diff --git a/type/__netbox/files/netbox.service b/type/__netbox/files/netbox.service
new file mode 100644
index 0000000..88baaeb
--- /dev/null
+++ b/type/__netbox/files/netbox.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NetBox Service Wrapper
+Documentation=https://netbox.readthedocs.io/en/stable/
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/type/__netbox/gencode-remote b/type/__netbox/gencode-remote
index 0153579..d598aa8 100755
--- a/type/__netbox/gencode-remote
+++ b/type/__netbox/gencode-remote
@@ -98,6 +98,7 @@ fi
 if [ "$changes" = "yes" ]; then
     cat << EOF
 # Restart service.
+service netbox restart
 service netbox-rq restart
 EOF
 fi
diff --git a/type/__netbox/manifest b/type/__netbox/manifest
index 079ea48..95688d3 100755
--- a/type/__netbox/manifest
+++ b/type/__netbox/manifest
@@ -204,7 +204,9 @@ $SECRET_KEY
 SECRET
 
 
-# Upload systemd unit for worker service
-__systemd_unit netbox-rq.service \
-    --source "$__type/files/netbox-rq.service" \
-    --enablement-state enabled
+# Upload systemd unit for worker and wsgi service
+for unit in netbox netbox-rq; do
+    __systemd_unit $unit.service \
+        --source "$__type/files/$unit.service" \
+        --enablement-state enabled
+done
diff --git a/type/__netbox_gunicorn/files/netbox.service b/type/__netbox_gunicorn/files/netbox.service
index 475ddc4..2154d27 100644
--- a/type/__netbox_gunicorn/files/netbox.service
+++ b/type/__netbox_gunicorn/files/netbox.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=NetBox Gunicorn WSGI Service
 Documentation=https://netbox.readthedocs.io/en/stable/
+PartOf=netbox.service
+After=netbox.service
 After=network-online.target
 Wants=network-online.target
 
@@ -19,5 +21,4 @@ RestartSec=30
 PrivateTmp=true
 
 [Install]
-Alias=netbox.service
 WantedBy=multi-user.target
diff --git a/type/__netbox_gunicorn/gencode-remote b/type/__netbox_gunicorn/gencode-remote
index e424c22..163bb1a 100755
--- a/type/__netbox_gunicorn/gencode-remote
+++ b/type/__netbox_gunicorn/gencode-remote
@@ -19,12 +19,6 @@ if grep -q "^__file/opt/netbox/gunicorn.py:" "$__messages_in"; then
     printf "configured\n" >> "$__messages_out"
 fi
 
-# application
-if grep -q "^__netbox:" "$__messages_in"; then
-    do_restart=yes
-    # no message cause it should be obvious
-fi
-
 
 # restart gunicorn
 if [ "$do_restart" ]; then
diff --git a/type/__netbox_gunicorn/man.rst b/type/__netbox_gunicorn/man.rst
index 43f5864..ac86261 100644
--- a/type/__netbox_gunicorn/man.rst
+++ b/type/__netbox_gunicorn/man.rst
@@ -37,8 +37,7 @@ updated $old to $new
 configured
     Configuration for gunicorn changed.
 
-In both cases, and at messages from the `__netbox` type, it restarts the
-service to using the up-to-date version.
+In both cases, it restarts the service to use the up-to-date version.
 
 
 EXAMPLES
diff --git a/type/__netbox_uwsgi/files/netbox.service b/type/__netbox_uwsgi/files/netbox.service
index cfce752..bc10571 100644
--- a/type/__netbox_uwsgi/files/netbox.service
+++ b/type/__netbox_uwsgi/files/netbox.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=Netbox uWSGI WSGI Service
 Documentation=https://netbox.readthedocs.io/en/stable/
+PartOf=netbox.service
+After=netbox.service
 After=network-online.target
 Wants=network-online.target
 
@@ -19,5 +21,4 @@ RestartSec=30
 PrivateTmp=true
 
 [Install]
-Alias=netbox.service
 WantedBy=multi-user.target
diff --git a/type/__netbox_uwsgi/gencode-remote b/type/__netbox_uwsgi/gencode-remote
index 5cc82d1..3127b8b 100755
--- a/type/__netbox_uwsgi/gencode-remote
+++ b/type/__netbox_uwsgi/gencode-remote
@@ -19,12 +19,6 @@ if grep -q "^__file/opt/netbox/uwsgi.ini:" "$__messages_in"; then
     printf "configured\n" >> "$__messages_out"
 fi
 
-# application
-if grep -q "^__netbox:" "$__messages_in"; then
-    do_restart=yes
-    # no messages cause this is obvious
-fi
-
 
 # restart uwsgi
 if [ "$do_restart" ]; then
diff --git a/type/__netbox_uwsgi/man.rst b/type/__netbox_uwsgi/man.rst
index 5bf3160..f328496 100644
--- a/type/__netbox_uwsgi/man.rst
+++ b/type/__netbox_uwsgi/man.rst
@@ -39,8 +39,7 @@ upgraded
 configured
     The uwsgi configuration got updated.
 
-In both cases, and at messages from the `__netbox` type, it restarts the
-service to using the up-to-date version.
+In all cases, it restarts the service to use the up-to-date version.
 
 
 EXAMPLES