diff --git a/configuration/systemd/aura-engine-core.service b/configuration/systemd/aura-engine-core.service
new file mode 100644
index 0000000000000000000000000000000000000000..c98925dbd36ad4a7c373b891bff4e693ef3770b9
--- /dev/null
+++ b/configuration/systemd/aura-engine-core.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Aura Engine - Playout Server
+After=network.target
+Documentation=https://gitlab.servus.at/aura/engine
+Requires=aura-engine-lqs.socket
+
+[Service]
+Type=simple
+User=engineuser
+WorkingDirectory=/opt/aura/engine
+ExecStart=/opt/aura/engine/run.sh core
+ExecStop=/opt/aura/engine/guru.py --shutdown --quiet
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=aura-engine-core.service
\ No newline at end of file
diff --git a/configuration/systemd/aura-engine-lqs.service b/configuration/systemd/aura-engine-lqs.service
new file mode 100644
index 0000000000000000000000000000000000000000..65bb4bf7fbb580265521a7cae7f02991816be562
--- /dev/null
+++ b/configuration/systemd/aura-engine-lqs.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Aura Engine - Liquidsoap
+After=network.target
+Documentation=https://gitlab.servus.at/aura/engine
+;StandardInput=socket
+
+[Service]
+Type=simple
+User=engineuser
+WorkingDirectory=/opt/aura/engine
+ExecStart=/opt/aura/engine/run.sh lqs
+Restart=always
+
+[Install]
+; WantedBy=multi-user.target
+WantedBy=sockets.target
+Alias=aura-engine-lqs.service
diff --git a/configuration/systemd/aura-engine-lqs.socket b/configuration/systemd/aura-engine-lqs.socket
new file mode 100644
index 0000000000000000000000000000000000000000..cffb09250fd97dbb76c98c219a6b19196f71bf83
--- /dev/null
+++ b/configuration/systemd/aura-engine-lqs.socket
@@ -0,0 +1,6 @@
+[Socket]
+ListenStream=/opt/aura/engine/modules/liquidsoap/engine.sock
+Accept=false
+
+[Install]
+WantedBy=sockets.target
\ No newline at end of file
diff --git a/docs/installation-production.md b/docs/installation-production.md
index 673700a3a39d8bdf3dffceac6a7a92913a29a50d..1b86cc292ad10092754d931398dab7dccd903b2f 100644
--- a/docs/installation-production.md
+++ b/docs/installation-production.md
@@ -229,6 +229,10 @@ Copy the unit file `/opt/aura/engine/configuration/systemd/aura-engine.service`
 This unit file starts engine-core and engine-liquidsoap within one command. Here Liquidsoap is started as
 as subprocess.
 
+> Please note not to use any other unit files in that directory yet. They are work in progress.
+
+Now you'll need to reload the Systemd unit files
+
 ```shell
 sudo systemctl daemon-reload
 ```