diff --git a/debian/eggnoggpi/etc/systemd/system/eggnoggpi.service b/debian/eggnoggpi/etc/systemd/system/eggnoggpi.service
index 9a5301e..6bb2fc9 100644
--- a/debian/eggnoggpi/etc/systemd/system/eggnoggpi.service
+++ b/debian/eggnoggpi/etc/systemd/system/eggnoggpi.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Eggnogg Plus on a Raspberry Pi
-Requires=mpv.service
+Require=sound.target
 After=mpv.service
 
 [Service]
@@ -9,7 +9,10 @@ User=pi
 Group=pi
 EnvironmentFile=/etc/default/eggnogg
 
+Restart=always
+RestartSec=5s
 WorkingDirectory=/usr/local/games/eggnoggplus-linux
+ExecStartPre=/usr/local/bin/pulseaudio.sh
 ExecStart=/usr/local/games/eggnoggplus-linux/eggnoggplus
 
 [Install]
diff --git a/debian/eggnoggpi/etc/systemd/system/mpv.service b/debian/eggnoggpi/etc/systemd/system/mpv.service
index 3168055..617033d 100755
--- a/debian/eggnoggpi/etc/systemd/system/mpv.service
+++ b/debian/eggnoggpi/etc/systemd/system/mpv.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=mpv audio service
+Require=sound.target
+After=sound.target
 
 [Service]
 Restart=always
@@ -7,6 +9,9 @@ User=pi
 Group=pi
 EnvironmentFile=/etc/default/eggnogg
 
+Restart=always
+RestartSec=5s
+#ExecStartPre=/usr/local/bin/pulseaudio.sh && /usr/bin/mpv --no-audio-display /home/pi/intro.ogg
 ExecStartPre=/usr/bin/mpv --no-audio-display /home/pi/intro.ogg
 ExecStart=/usr/bin/mpv --loop=inf --no-audio-display --volume=80 /home/pi/music.ogg
 
diff --git a/eggnoggpi.deb b/eggnoggpi.deb
index 0553c04..3f433cf 100644
Binary files a/eggnoggpi.deb and b/eggnoggpi.deb differ