diff --git a/Jenkinsfile b/Jenkinsfile
index 543d6f5..b263a28 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
                         steps {
                             sh "./scripts/docker_build_image.sh ${DISTRO}"
                             sh "./scripts/docker_save_image.sh ${DISTRO}"
-                            stash includes: "gitignore/docker/${DISTRO}.tar.zst", name: "${DISTRO}-stash"
+                            stash includes: "gitignore/docker/*${DISTRO}.tar.zst", name: "${DISTRO}-stash"
                         }
                     }
                 }
diff --git a/lib/docker.sh b/lib/docker.sh
index ef3a113..5610ff5 100644
--- a/lib/docker.sh
+++ b/lib/docker.sh
@@ -70,12 +70,13 @@ docker_build_image() {
 		{
 			echo "FROM ${distro}"
 			echo 'SHELL ["/bin/bash", "-c"]'
+			echo 'RUN ln -sf /bin/bash /bin/sh'
+			echo 'ENV DEBIAN_FRONTEND=noninteractive'
 			echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}"
 			echo "RUN ${pkg_install} ${req_pkgs}"
 			echo 'RUN pipx install virtualenv'
 			echo 'RUN pipx ensurepath'
 			echo 'RUN curl https://sh.rustup.rs -sSf | bash -s -- -y'
-			echo 'RUN ln -sf /bin/bash /bin/sh'
 			echo 'ENV PATH="~/.cargo/bin:$PATH"'
 			echo 'RUN rustup default stable && rustup update stable'
 			echo 'RUN cargo install cargo-c'