diff --git a/conf/systemd/user/qbittorrent-nox.service b/conf/systemd/user/qbittorrent-nox.service
deleted file mode 100644
index 789865d9..00000000
--- a/conf/systemd/user/qbittorrent-nox.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=A Headless Bittorrent client using rb_libtorrent
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/qbittorrent-nox --webui-port=8081
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-RestartSec=5
-
-[Install]
-WantedBy=default.target
diff --git a/etc/systemd/system/qbittorrent-nox@.service.d/nordvpn.conf b/etc/systemd/system/qbittorrent-nox@.service.d/nordvpn.conf
new file mode 120000
index 00000000..3a08627f
--- /dev/null
+++ b/etc/systemd/system/qbittorrent-nox@.service.d/nordvpn.conf
@@ -0,0 +1 @@
+../service.d/nordvpn.conf
\ No newline at end of file
diff --git a/etc/systemd/system/qbittorrent-nox@.service.d/webui-port.conf b/etc/systemd/system/qbittorrent-nox@.service.d/webui-port.conf
new file mode 100644
index 00000000..44cde7ea
--- /dev/null
+++ b/etc/systemd/system/qbittorrent-nox@.service.d/webui-port.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/bin/qbittorrent-nox --webui-port=8081
diff --git a/etc/systemd/system/service.d/nordvpn.conf b/etc/systemd/system/service.d/nordvpn.conf
index 0b976f9c..135efb51 100644
--- a/etc/systemd/system/service.d/nordvpn.conf
+++ b/etc/systemd/system/service.d/nordvpn.conf
@@ -3,4 +3,4 @@ Wants=nordvpnd.service
 After=nordvpnd.service
 
 [Service]
-ExecStartPre=/usr/bin/nordvpn connect
+ExecStartPre=/usr/bin/nordvpn connect p2p