diff --git a/tools/warp/Dockerfile.template b/tools/warp/Dockerfile.template
index daa901d61..5eec27e88 100644
--- a/tools/warp/Dockerfile.template
+++ b/tools/warp/Dockerfile.template
@@ -1,6 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM ghcr.io/uniget-org/tools/base:latest AS download
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
@@ -25,9 +29,8 @@ echo "### Downloading warp ${version}"
 curl --silent --location --fail "https://github.com/minio/warp/releases/download/v${version}/warp_Linux_${arch_suffix}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     warp
-EOF
 
-FROM download AS prepare
-COPY <<EOF ${prefix}/share/bash-completion/completions/warp
+cat <<"EOT" >"${prefix}/share/bash-completion/completions/warp"
 complete -C warp warp
+EOT
 EOF
\ No newline at end of file
diff --git a/tools/wasmi/Dockerfile.template b/tools/wasmi/Dockerfile.template
index 62c65ac36..64ea9b325 100644
--- a/tools/wasmi/Dockerfile.template
+++ b/tools/wasmi/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=rust / /
+COPY --from=rust / /usr/local
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 apt-get update
@@ -18,8 +18,9 @@ WORKDIR /tmp/github.com/paritytech/wasmi
 ARG name
 ARG version
 RUN <<EOF
-source "/etc/profile.d/cargo.sh"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/paritytech/wasmi .
+export CARGO_HOME=/usr/local/cargo
+export RUSTUP_HOME=/usr/local/rustup
 export RUSTFLAGS='-C target-feature=+crt-static'
 cargo build --release --target "${arch}-unknown-linux-gnu"
 cp "target/${arch}-unknown-linux-gnu/release/wasmi_cli" "${prefix}/bin/"