diff --git a/type/__netbox/files/netbox.service b/type/__netbox/files/netbox.service
index 88baaeb..738e178 100644
--- a/type/__netbox/files/netbox.service
+++ b/type/__netbox/files/netbox.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=NetBox Service Wrapper
 Documentation=https://netbox.readthedocs.io/en/stable/
-After=network-online.target
-Wants=network-online.target
+After=network.target
+Wants=network.target
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+ExecStart=/bin/true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/type/__netbox_gunicorn/files/netbox.service b/type/__netbox_gunicorn/files/netbox.service
index 2154d27..55f3549 100644
--- a/type/__netbox_gunicorn/files/netbox.service
+++ b/type/__netbox_gunicorn/files/netbox.service
@@ -3,22 +3,24 @@ 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
+After=network.target
+Wants=network.target
 
 [Service]
 Type=simple
 
 User=netbox
 Group=netbox
-PIDFile=/var/tmp/netbox.pid
 WorkingDirectory=/opt/netbox
 
-ExecStart=/opt/netbox/venv/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/netbox --config /opt/netbox/gunicorn.py netbox.wsgi
+ExecStart=/opt/netbox/venv/bin/gunicorn --pythonpath /opt/netbox/netbox --config /opt/netbox/gunicorn.py netbox.wsgi
+# signals: https://docs.gunicorn.org/en/stable/signals.html
+ExecReload=kill -HUP $MAINPID
+ExecStop=kill -TERM $MAINPID
+KillSignal=SIGQUIT
 
 Restart=on-failure
 RestartSec=30
-PrivateTmp=true
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=netbox.service
diff --git a/type/__netbox_uwsgi/files/netbox.service b/type/__netbox_uwsgi/files/netbox.service
index bc10571..10ea734 100644
--- a/type/__netbox_uwsgi/files/netbox.service
+++ b/type/__netbox_uwsgi/files/netbox.service
@@ -3,22 +3,24 @@ 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
+After=network.target
+Wants=network.target
 
 [Service]
 Type=simple
 
 User=netbox
 Group=netbox
-PIDFile=/var/tmp/netbox.pid
-WorkingDirectory=/opt/netbox
+WorkingDirectory=/opt/netbox/netbox/
 
-ExecStart=/opt/netbox/venv/bin/uwsgi --master --wsgi-file netbox/netbox/wsgi.py uwsgi.ini
+ExecStart=/opt/netbox/venv/bin/uwsgi --master --module netbox.wsgi uwsgi.ini
+# signals: https://uwsgi-docs.readthedocs.io/en/latest/Management.html#signals-for-controlling-uwsgi
+ExecReload=kill -HUP $MAINPID
+ExecStop=kill -INT $MAINPID
+KillSignal=SIGQUIT
 
 Restart=on-failure
 RestartSec=30
-PrivateTmp=true
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=netbox.service