diff --git a/root/etc/services.d/keychain/run b/root/etc/services.d/keychain/run
index 50f7162..1fd3e00 100755
--- a/root/etc/services.d/keychain/run
+++ b/root/etc/services.d/keychain/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Start ssh keychain as jackson
-exec s6-setuidgid jackson keychain
+# exec gosu jackson keychain
diff --git a/root/etc/services.d/rescuetime/run b/root/etc/services.d/rescuetime/run
index 053c2f1..0caa446 100755
--- a/root/etc/services.d/rescuetime/run
+++ b/root/etc/services.d/rescuetime/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Start rescuetime as jackson
-exec s6-setuidgid jackson rescuetime
+# exec gosu jackson rescuetime
diff --git a/root/etc/services.d/tmux/run b/root/etc/services.d/tmux/run
index 42cd2a3..9ebcfeb 100755
--- a/root/etc/services.d/tmux/run
+++ b/root/etc/services.d/tmux/run
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Start tmux server as jackson
-exec s6-setuidgid jackson \
-  tmux new-session -s desktop-environment zsh --login
+# exec gosu jackson \
+#  tmux new-session -d -s desktop-environment zsh --login
diff --git a/scripts/kill-all.sh b/scripts/kill-all.sh
index a8b72b9..4adbf2d 100755
--- a/scripts/kill-all.sh
+++ b/scripts/kill-all.sh
@@ -5,6 +5,6 @@ export $($REPO_ROOT/scripts/environment.sh)
 
 # Remove all non desktop environment containers
 docker ps -a | \
-  grep -v $DESKTOP_ENVIRONMENT_CONTAINER | \
+  grep -v " $DESKTOP_ENVIRONMENT_CONTAINER" | \
   cut -b 1-20 | \
   xargs docker rm -f