diff --git a/.dockerignore b/.dockerignore
index 44111dfd4d533deb6c98267225fe32f69a5d5f12..e231e590c1aa7d3ee72ec32f85f985a906838ec6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
 .build/
 .build.*/
 .dockerignore
+*.AppImage
 
 target/
 appimage/
diff --git a/lektord/src/main.rs b/lektord/src/main.rs
index 91bcc2d607f7f31ee181b73a8e72446c6c1178f7..9615519fc2b85d137b88a0ed812262400c9a97ee 100644
--- a/lektord/src/main.rs
+++ b/lektord/src/main.rs
@@ -7,10 +7,7 @@ mod listen;
 mod mpris;
 mod routes;
 
-pub use app::*;
-pub use config::*;
-pub use error::*;
-pub use listen::*;
+pub use self::{app::*, config::*, error::*, listen::*};
 
 use anyhow::{Context, Result};
 use cmd::SubCommand;
diff --git a/utils/scripts/docker/package_appimages.bash b/utils/scripts/docker/package_appimages.bash
index fa70e202b330436271960cb4f25c3e3225bd0e0e..d950d7912677cca313b5acdba8a49e4c083a1b1c 100755
--- a/utils/scripts/docker/package_appimages.bash
+++ b/utils/scripts/docker/package_appimages.bash
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 [ ! -f /build/.gitignore ] && {
     echo "The appimage folder is not mounted in the docker"
     exit 1
diff --git a/utils/scripts/docker/prepare_workspace.bash b/utils/scripts/docker/prepare_workspace.bash
index 3bcc61b6d114fc38282b54235525b3d253c160ed..b7eab44bb8396dfdbcdb2ddebeaabf6b44a460db 100755
--- a/utils/scripts/docker/prepare_workspace.bash
+++ b/utils/scripts/docker/prepare_workspace.bash
@@ -22,5 +22,4 @@ else
     for PKG in kurisu_api lektor_* lkt amadeus lektord; do
         cargo clean -p ${PKG}
     done
-    rm -rf kurisu_api lektor_* lkt amadeus lektord
 fi
diff --git a/utils/scripts/docker/setup_base.bash b/utils/scripts/docker/setup_base.bash
index bbdf53c6e3df23f828eef3cacea75a617d030335..ca84c2952742d0652bb4b40d06c1b2dcac864240 100755
--- a/utils/scripts/docker/setup_base.bash
+++ b/utils/scripts/docker/setup_base.bash
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 
 ARCH=$(arch)
 PKG_BASE="make libmpv-dev cmake clang clang-format manpages man-db"
diff --git a/utils/scripts/docker/touch_files.bash b/utils/scripts/docker/touch_files.bash
index ecf319a7c7b47c5ec469fa96378dc21346a01dc0..a93c3262e8cea4c68b559bc7d145ec767b1b32ae 100755
--- a/utils/scripts/docker/touch_files.bash
+++ b/utils/scripts/docker/touch_files.bash
@@ -7,10 +7,11 @@ shopt -s globstar
     exit 1
 }
 
-# Remove the thing we used to setup the build cache...
-rm -rf kurisu_api lektor_* lkt amadeus lektord
-
 # Get the sources...
-for THING in /src/*; do
-    cp -rf ${THING} .
+for SOURCE in /src/**; do
+    [ -f ${SOURCE} ] \
+        && [[ ! ${SOURCE} == "/src/build"* ]] \
+        && [[ ! ${SOURCE} == "/src/utils"* ]] \
+        && [[ ! ${SOURCE} == "/src/compile_commands.json" ]] \
+        && install -CD ${SOURCE} $(realpath --relative-base=/src/ ${SOURCE})
 done