diff --git a/init/kodi-gbm.service b/init/kodi-gbm.service
index 5b35866..52a907a 100644
--- a/init/kodi-gbm.service
+++ b/init/kodi-gbm.service
@@ -15,7 +15,8 @@ Environment=WINDOWING=gbm
 ExecStart=/usr/bin/kodi-standalone
 Restart=on-abort
 StandardInput=tty
-StandardOutput=journal
+StandardOutput=file:/var/log/kodi-gbm-standalone.log
+StandardError=file:/var/log/kodi-gbm-standalone.log
 
 [Install]
 Alias=display-manager.service
diff --git a/init/kodi-wayland.service b/init/kodi-wayland.service
index 101effe..002701f 100644
--- a/init/kodi-wayland.service
+++ b/init/kodi-wayland.service
@@ -14,7 +14,8 @@ Environment=WINDOWING=wayland
 ExecStart=/usr/bin/cage -- /usr/bin/kodi-standalone
 Restart=on-abort
 StandardInput=tty
-StandardOutput=journal
+StandardOutput=file:/var/log/kodi-wayland-standalone.log
+StandardError=file:/var/log/kodi-wayland-standalone.log
 
 [Install]
 Alias=display-manager.service
diff --git a/init/kodi.service b/init/kodi.service
index 7f8d4bb..3556db3 100644
--- a/init/kodi.service
+++ b/init/kodi.service
@@ -12,9 +12,11 @@ PAMName=login
 TTYPath=/dev/tty1
 Environment=WINDOWING=x11
 ExecStart=/usr/bin/xinit /usr/bin/kodi-standalone -- :0 -nolisten tcp vt1
+ExecStop=/usr/bin/pkill kodi
 Restart=on-abort
 StandardInput=tty
-StandardOutput=journal
+StandardOutput=file:/var/log/kodi-x11-standalone.log
+StandardError=file:/var/log/kodi-x11-standalone.log
 
 [Install]
 Alias=display-manager.service