diff --git a/docker/Dockerfile b/docker/Dockerfile
index 26ff8ee..d48d761 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -158,6 +158,10 @@ RUN wget -qnv -O kind https://github.com/kubernetes-sigs/kind/releases/download/
 RUN curl -fsSL https://github.com/jesseduffield/lazydocker/releases/download/v0.2.4/lazydocker_0.2.4_Linux_x86_64.tar.gz | \
   tar -C /usr/local/bin -xzf -
 
+# Install lazygit
+RUN curl -fsSL https://github.com/jesseduffield/lazygit/releases/download/v0.8.1/lazygit_0.8.1_Linux_x86_64.tar.gz | \
+  tar -C /usr/local/bin -xzf -
+
 # Install musikcube
 RUN wget -O musikcube.deb -nv https://github.com/clangen/musikcube/releases/download/0.62.0/musikcube_0.62.0_ubuntu_cosmic_amd64.deb && \
   dpkg -i musikcube.deb || apt-get install -qq --fix-broken && \
@@ -277,8 +281,9 @@ RUN gosu $USER zsh -c "source $HOME/.zshrc"
 # Cache tmux plugins
 RUN gosu $USER zsh -c /opt/tpm/bin/install_plugins
 
-# Add static container filesystem
-COPY root /
+# Configure lazygit
+RUN mkdir -p $HOME/.config/jesseduffield/lazygit && \
+  echo 'reporting: "off"' > $HOME/.config/jesseduffield/lazygit/config.yml
 
 # Become desktop environment user
 USER $USER
diff --git a/docker/root/etc/services.d/gotty/down b/docker/root/etc/services.d/gotty/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/gotty/run b/docker/root/etc/services.d/gotty/run
deleted file mode 100755
index f997744..0000000
--- a/docker/root/etc/services.d/gotty/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start gotty server as jackson
-gosu jackson gotty --permit-write --port 8022 zsh -c 'tmux new-session -s gotty-$(date +%s) -t gotty'
diff --git a/docker/root/etc/services.d/keychain/down b/docker/root/etc/services.d/keychain/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/keychain/run b/docker/root/etc/services.d/keychain/run
deleted file mode 100755
index a691dd3..0000000
--- a/docker/root/etc/services.d/keychain/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start ssh keychain as jackson
-gosu jackson keychain
diff --git a/docker/root/etc/services.d/rescuetime/down b/docker/root/etc/services.d/rescuetime/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/rescuetime/run b/docker/root/etc/services.d/rescuetime/run
deleted file mode 100755
index d6040c0..0000000
--- a/docker/root/etc/services.d/rescuetime/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start rescuetime as jackson
-# gosu jackson rescuetime
diff --git a/docker/root/etc/services.d/tmux-desktop-environment/down b/docker/root/etc/services.d/tmux-desktop-environment/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/tmux-desktop-environment/run b/docker/root/etc/services.d/tmux-desktop-environment/run
deleted file mode 100755
index 76ed1e8..0000000
--- a/docker/root/etc/services.d/tmux-desktop-environment/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start tmux server as jackson
-gosu jackson tmux new-session -s desktop-environment
diff --git a/docker/root/etc/services.d/tmux-gotty-clients/down b/docker/root/etc/services.d/tmux-gotty-clients/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/tmux-gotty-clients/run b/docker/root/etc/services.d/tmux-gotty-clients/run
deleted file mode 100755
index 07c7509..0000000
--- a/docker/root/etc/services.d/tmux-gotty-clients/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start gotty-clients tmux session as jackson
-gosu jackson tmux new-session -s gotty-clients
diff --git a/docker/root/etc/services.d/transmission/down b/docker/root/etc/services.d/transmission/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/transmission/run b/docker/root/etc/services.d/transmission/run
deleted file mode 100755
index 3aa6b47..0000000
--- a/docker/root/etc/services.d/transmission/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start transmission daemon as jackson
-gosu jackson transmission-daemon \
-  --bind-address-ipv4 localhost \
-  --config-dir $HOME/.config/transmission \
-  --download-dir $HOME/torrents \
-  --foreground \
-  --no-auth \
-  --rpc-bind-address localhost \
-  --watch-dir $HOME/torrents/.watch
diff --git a/docker/root/etc/services.d/webrelay/down b/docker/root/etc/services.d/webrelay/down
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/root/etc/services.d/webrelay/run b/docker/root/etc/services.d/webrelay/run
deleted file mode 100755
index ac25c1e..0000000
--- a/docker/root/etc/services.d/webrelay/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/execlineb -P
-
-# Start webrelay tunnel as jackson
-gosu jackson relay connect -s $HOSTNAME --crypto full http://localhost:8022