diff --git a/configuration/systemd/aura-engine-core.service b/configuration/systemd/aura-engine-core.service
index c98925dbd36ad4a7c373b891bff4e693ef3770b9..ee8eb49b79915ba8cfd5fa7d9f07f9828dad9583 100644
--- a/configuration/systemd/aura-engine-core.service
+++ b/configuration/systemd/aura-engine-core.service
@@ -1,8 +1,7 @@
 [Unit]
-Description=Aura Engine - Playout Server
+Description=Aura Engine - Playout Server (Core)
 After=network.target
 Documentation=https://gitlab.servus.at/aura/engine
-Requires=aura-engine-lqs.socket
 
 [Service]
 Type=simple
diff --git a/configuration/systemd/aura-engine-lqs.service b/configuration/systemd/aura-engine-lqs.service
index 65bb4bf7fbb580265521a7cae7f02991816be562..4bdef746e7ab2554e74a83bd0ac1e1b903aa207f 100644
--- a/configuration/systemd/aura-engine-lqs.service
+++ b/configuration/systemd/aura-engine-lqs.service
@@ -1,17 +1,16 @@
 [Unit]
-Description=Aura Engine - Liquidsoap
-After=network.target
+Description=Aura Engine - Playout Server (Liquidsoap)
 Documentation=https://gitlab.servus.at/aura/engine
-;StandardInput=socket
+After=network.target
+Requires=aura-engine-lqs.socket
 
 [Service]
 Type=simple
 User=engineuser
 WorkingDirectory=/opt/aura/engine
-ExecStart=/opt/aura/engine/run.sh lqs
+ExecStart=/opt/aura/engine/engine/run.sh lqs
 Restart=always
 
 [Install]
-; WantedBy=multi-user.target
-WantedBy=sockets.target
+WantedBy=default.target
 Alias=aura-engine-lqs.service
diff --git a/configuration/systemd/aura-engine-lqs.socket b/configuration/systemd/aura-engine-lqs.socket
index cffb09250fd97dbb76c98c219a6b19196f71bf83..4f8c5267c4617e430dd8e9796ade7c666cf682bd 100644
--- a/configuration/systemd/aura-engine-lqs.socket
+++ b/configuration/systemd/aura-engine-lqs.socket
@@ -1,3 +1,7 @@
+[Unit]
+Description=Aura Engine - Liquidsoap Socket
+PartOf=aura-engine-lqs.service
+
 [Socket]
 ListenStream=/opt/aura/engine/modules/liquidsoap/engine.sock
 Accept=false
diff --git a/configuration/systemd/aura-engine.service b/configuration/systemd/aura-engine.service
index fda1e8ee393d62b81d653075a622c895a9ee5636..d315c64d19321f14e79eea14acb13e6f428247ea 100644
--- a/configuration/systemd/aura-engine.service
+++ b/configuration/systemd/aura-engine.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Aura Engine - Playout Server
-After=network.target
 Documentation=https://gitlab.servus.at/aura/engine
+After=network.target
 
 [Service]
 Type=simple