diff --git a/_machines/neptune.yml b/_machines/neptune.yml
index d84329e..dac1cce 100644
--- a/_machines/neptune.yml
+++ b/_machines/neptune.yml
@@ -1,5 +1,5 @@
 font_size_1: 12
-font_size_2: 9
+font_size_2: 12
 
 i3bar_icon_padding: ""
 
@@ -19,19 +19,16 @@ users:
       extensions:
         - ublock-origin
       manage_css: false
-  mail: hannes.koerber@tradebyte.com
+  mail: h.koerber@clipmyhorse.tv
   git_gpg_sign: false
   ssh_agent: true
   gpg_agent: false
   gpg_agent_for_ssh: false
   environment:
     MACHINE_HAS_NEXTCLOUD: "false"
-    MACHINE_HAS_RESTIC_BACKUP: "true"
-    MACHINE_HAS_KEEPASSX: "true"
+    MACHINE_HAS_RESTIC_BACKUP: "false"
+    MACHINE_HAS_KEEPASSX: "false"
   repositories: []
-  overrides:
-    terraform_version: 1.1.3
-    terraform_check_updates: false
 
 - name: hannes-private
   group: hannes-private
@@ -82,7 +79,7 @@ workspace:
   4: " remote"
   7: ""
   8: ""
-  9: ""
+  9: ""
   10: ""
 
 screencfgs:
@@ -92,4 +89,4 @@ screencfgs:
 environment:
   MACHINE_TYPE: "laptop"
   MACHINE_RESOLUTION_X: "1920"
-  MACHINE_RESOLUTION_Y: "1080"
+  MACHINE_RESOLUTION_Y: "1200"
diff --git a/test-in-docker.sh b/test-in-docker.sh
index 6ea1a8d..8754b51 100755
--- a/test-in-docker.sh
+++ b/test-in-docker.sh
@@ -51,17 +51,29 @@ test_ares() {
 }
 
 test_neptune() {
-    docker pull docker.io/library/ubuntu:20.04
-    docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname neptune docker.io/library/ubuntu:20.04 sh -c '
-        set -o errexit
-
-        cd $(mktemp -d)
-        tar xf /tmp/dotfiles.tar.gz -C .
-        ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
-    '
-}
+    docker run \
+        -ti \
+        --rm \
+        -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro \
+        --mount type=tmpfs,destination=/var/cache/pacman/pkg/ \
+        "${dockeropts[@]}" \
+        --hostname neptune \
+        docker.io/library/archlinux:base \
+        sh -c '
+            set -o errexit
 
+            # Uncomment CacheDir and append the host pacman cache as cachedir
+            # At worst, the cache directory will be ignored if it does not exist
+            # Pacman will always prefer the first cache directory, so newly downloaded
+            # packages will stay in the container
+            sed -i '"'"'s/^#\?\(CacheDir.*\)/CacheDir = \/var\/cache\/pacman\/pkg_host\/\n\1/'"'"' /etc/pacman.conf
 
+            mkdir -p /var/cache/pacman/pkg_host/
+            pacman -Syu --noconfirm linux
+            cd $(mktemp -d)
+            tar xf /tmp/dotfiles.tar.gz -C .
+            ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+        '
 }
 
 case "${1:-all}" in