diff --git a/tools/dagger/Dockerfile.template b/tools/dagger/Dockerfile.template
index 47b5677bce..d8fd95e1b7 100644
--- a/tools/dagger/Dockerfile.template
+++ b/tools/dagger/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "dagger/dagger" "v${version}" "dagger_v${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/dagger/dagger/releases/download/v${version}/dagger_v${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     dagger
 EOF
\ No newline at end of file
diff --git a/tools/dasel/Dockerfile.template b/tools/dasel/Dockerfile.template
index 892de69a02..d233c6883c 100644
--- a/tools/dasel/Dockerfile.template
+++ b/tools/dasel/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "TomWright/dasel" "v${version}" "dasel_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/dasel" \
+curl --silent --location --fail --output "${prefix}/bin/dasel" \
     "https://github.com/TomWright/dasel/releases/download/v${version}/dasel_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/dasel"
+chmod +x "${prefix}/bin/dasel"
 EOF
\ No newline at end of file
diff --git a/tools/datree/Dockerfile.template b/tools/datree/Dockerfile.template
index 7dd85553f5..53e09b3ae3 100644
--- a/tools/datree/Dockerfile.template
+++ b/tools/datree/Dockerfile.template
@@ -12,11 +12,11 @@ check-github-release-asset "datreeio/datree" "${version}" "datree-cli_${version}
 curl --silent --location --fail --remote-name "https://github.com/datreeio/datree/releases/download/${version}/datree-cli_${version}_Linux_${arch}.zip"
 unzip -q -o -d "/tmp" "datree-cli_${version}_Linux_${arch}.zip"
 rm "datree-cli_${version}_Linux_${arch}.zip"
-mv "/tmp/datree" "${prefix}${target}/bin"
-"${prefix}${target}/bin/datree" completion bash >"${prefix}${target}/share/bash-completion/completions/datree"
-"${prefix}${target}/bin/datree" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/datree.fish"
-"${prefix}${target}/bin/datree" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_datree"
+mv "/tmp/datree" "${prefix}/bin"
+"${prefix}/bin/datree" completion bash >"${prefix}/share/bash-completion/completions/datree"
+"${prefix}/bin/datree" completion fish >"${prefix}/share/fish/vendor_completions.d/datree.fish"
+"${prefix}/bin/datree" completion zsh >"${prefix}/share/zsh/vendor-completions/_datree"
 EOF
 RUN <<EOF
-"${prefix}${target}/bin/datree" config set offline local
+"${prefix}/bin/datree" config set offline local
 EOF
\ No newline at end of file
diff --git a/tools/dbui/Dockerfile.template b/tools/dbui/Dockerfile.template
index 9958b8463b..4810b0248a 100644
--- a/tools/dbui/Dockerfile.template
+++ b/tools/dbui/Dockerfile.template
@@ -12,6 +12,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "KenanBek/dbui" "v${version}" "dbui_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/KenanBek/dbui/releases/download/v${version}/dbui_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     dbui
 EOF
\ No newline at end of file
diff --git a/tools/ddosify/Dockerfile.template b/tools/ddosify/Dockerfile.template
index 762c02b711..4ce02eac80 100644
--- a/tools/ddosify/Dockerfile.template
+++ b/tools/ddosify/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ddosify/ddosify" "v${version}" "ddosify_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ddosify/ddosify/releases/download/v${version}/ddosify_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     ddosify
 EOF
\ No newline at end of file
diff --git a/tools/delta/Dockerfile.template b/tools/delta/Dockerfile.template
index 84acb51e08..d5d0df355c 100644
--- a/tools/delta/Dockerfile.template
+++ b/tools/delta/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,9 +18,10 @@ WORKDIR /tmp/github.com/dandavison/delta
 ARG name
 ARG version
 RUN <<EOF
-source "${target}/etc/profile.d/cargo.sh"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/dandavison/delta .
+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/delta" "${prefix}${target}/bin/"
+cp "target/${arch}-unknown-linux-gnu/release/delta" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/dependency-check/Dockerfile.template b/tools/dependency-check/Dockerfile.template
index 7d2cd62967..ab78ab39ef 100644
--- a/tools/dependency-check/Dockerfile.template
+++ b/tools/dependency-check/Dockerfile.template
@@ -12,7 +12,7 @@ check-github-release-asset "jeremylong/DependencyCheck" "v${version}" "dependenc
 url="https://github.com/jeremylong/DependencyCheck/releases/download/v${version}/dependency-check-${version}-release.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/opt" "${filename}"
-ln --symbolic --relative --force "${target}/opt/dependency-check/bin/dependency-check.sh" "${prefix}${target}/bin/dependency-check.sh"
-mv "${prefix}${target}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}${target}/share/bash-completion/completions/dependency-check.sh"
+unzip -q -o -d "${prefix}/opt" "${filename}"
+ln --symbolic --relative --force "/opt/dependency-check/bin/dependency-check.sh" "${prefix}/bin/dependency-check.sh"
+mv "${prefix}/opt/dependency-check/bin/completion-for-dependency-check.sh" "${prefix}/share/bash-completion/completions/dependency-check.sh"
 EOF
\ No newline at end of file
diff --git a/tools/depot/Dockerfile.template b/tools/depot/Dockerfile.template
index fc616424da..948236d791 100644
--- a/tools/depot/Dockerfile.template
+++ b/tools/depot/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "depot/cli" "v${version}" "depot_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/depot/cli/releases/download/v${version}/depot_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     bin/depot
 
-"${prefix}${target}/bin/depot" completion bash >"${prefix}${target}/share/bash-completion/completions/depot"
-"${prefix}${target}/bin/depot" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/depot.fish"
-"${prefix}${target}/bin/depot" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_depot"
+"${prefix}/bin/depot" completion bash >"${prefix}/share/bash-completion/completions/depot"
+"${prefix}/bin/depot" completion fish >"${prefix}/share/fish/vendor_completions.d/depot.fish"
+"${prefix}/bin/depot" completion zsh >"${prefix}/share/zsh/vendor-completions/_depot"
 EOF
\ No newline at end of file
diff --git a/tools/devbox/Dockerfile.template b/tools/devbox/Dockerfile.template
index daf2c4cdb3..a8f30bfd78 100644
--- a/tools/devbox/Dockerfile.template
+++ b/tools/devbox/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "jetpack-io/devbox" "${version}" "devbox_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jetpack-io/devbox/releases/download/${version}/devbox_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 
-"${prefix}${target}/bin/devbox" completion bash >"${prefix}${target}/share/bash-completion/completions/devbox"
-"${prefix}${target}/bin/devbox" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devbox.fish"
-"${prefix}${target}/bin/devbox" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devbox"
+"${prefix}/bin/devbox" completion bash >"${prefix}/share/bash-completion/completions/devbox"
+"${prefix}/bin/devbox" completion fish >"${prefix}/share/fish/vendor_completions.d/devbox.fish"
+"${prefix}/bin/devbox" completion zsh >"${prefix}/share/zsh/vendor-completions/_devbox"
 EOF
\ No newline at end of file
diff --git a/tools/devcontainer/Dockerfile.template b/tools/devcontainer/Dockerfile.template
index eb3c0aa1c8..db9950304c 100644
--- a/tools/devcontainer/Dockerfile.template
+++ b/tools/devcontainer/Dockerfile.template
@@ -21,12 +21,12 @@ apt-get update
 apt-get -y install --no-install-recommends \
     build-essential
 EOF
-WORKDIR ${prefix}${target}/libexec/devcontainer
+WORKDIR ${prefix}/libexec/devcontainer
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "@devcontainers/cli@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/devcontainer/node_modules/.bin/devcontainer" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/devpod/Dockerfile.template b/tools/devpod/Dockerfile.template
index 1ff2160d23..266ef77b6f 100644
--- a/tools/devpod/Dockerfile.template
+++ b/tools/devpod/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "loft-sh/devpod" "v${version}" "devpod-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/devpod" \
+curl --silent --location --fail --output "${prefix}/bin/devpod" \
     "https://github.com/loft-sh/devpod/releases/download/v${version}/devpod-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/devpod"
+chmod +x "${prefix}/bin/devpod"
 
-"${prefix}${target}/bin/devpod" completion bash >"${prefix}${target}/share/bash-completion/completions/devpod"
-"${prefix}${target}/bin/devpod" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/devpod.fish"
-"${prefix}${target}/bin/devpod" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_devpod"
+"${prefix}/bin/devpod" completion bash >"${prefix}/share/bash-completion/completions/devpod"
+"${prefix}/bin/devpod" completion fish >"${prefix}/share/fish/vendor_completions.d/devpod.fish"
+"${prefix}/bin/devpod" completion zsh >"${prefix}/share/zsh/vendor-completions/_devpod"
 EOF
\ No newline at end of file
diff --git a/tools/diffoci/Dockerfile.template b/tools/diffoci/Dockerfile.template
index 62302c1978..f2fdbaa518 100644
--- a/tools/diffoci/Dockerfile.template
+++ b/tools/diffoci/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "reproducible-containers/diffoci" "v${version}" "diffoci-v${version}.linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/diffoci" \
+curl --silent --location --fail --output "${prefix}/bin/diffoci" \
     "https://github.com/reproducible-containers/diffoci/releases/download/v${version}/diffoci-v${version}.linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/diffoci"
+chmod +x "${prefix}/bin/diffoci"
 
-"${prefix}${target}/bin/diffoci" completion bash >"${prefix}${target}/share/bash-completion/completions/diffoci"
-"${prefix}${target}/bin/diffoci" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/diffoci.fish"
-"${prefix}${target}/bin/diffoci" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_diffoci"
+"${prefix}/bin/diffoci" completion bash >"${prefix}/share/bash-completion/completions/diffoci"
+"${prefix}/bin/diffoci" completion fish >"${prefix}/share/fish/vendor_completions.d/diffoci.fish"
+"${prefix}/bin/diffoci" completion zsh >"${prefix}/share/zsh/vendor-completions/_diffoci"
 EOF
\ No newline at end of file
diff --git a/tools/dinit/Dockerfile.template b/tools/dinit/Dockerfile.template
index db0368c656..6cee44ab0a 100644
--- a/tools/dinit/Dockerfile.template
+++ b/tools/dinit/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 # check-github-release-asset "foo/bar" "${version}" "foo-${version}-linux-amd64.tar.gz"
-curl --silent --location --fail --output "${prefix}${target}/bin/dinit" \
+curl --silent --location --fail --output "${prefix}/bin/dinit" \
     "https://gitlab.com/tozd/dinit/-/releases/v${version}/downloads/linux-${alt_arch}/dinit"
-chmod +x "${prefix}${target}/bin/dinit"
+chmod +x "${prefix}/bin/dinit"
 EOF
\ No newline at end of file
diff --git a/tools/direnv/Dockerfile.template b/tools/direnv/Dockerfile.template
index 399c4334bd..ec1d5dacc9 100644
--- a/tools/direnv/Dockerfile.template
+++ b/tools/direnv/Dockerfile.template
@@ -9,17 +9,19 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "direnv/direnv" "v${version}" "direnv.linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/direnv" \
+curl --silent --location --fail --output "${prefix}/bin/direnv" \
     "https://github.com/direnv/direnv/releases/download/v${version}/direnv.linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/direnv"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-fetchurl.1" \
+chmod +x "${prefix}/bin/direnv"
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-fetchurl.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv-fetchurl.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv-stdlib.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv-stdlib.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv-stdlib.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/direnv.toml.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/direnv.toml.1" \
     "https://github.com/direnv/direnv/raw/v${version}/man/direnv.toml.1"
-EOF
 
-COPY direnv.sh ${prefix}/etc/profile.d/
\ No newline at end of file
+cat <<EOF >"${prefix}/etc/profile.d/direnv.sh"
+#!/bin/bash
+eval "\$(direnv hook bash)"
+EOF
\ No newline at end of file
diff --git a/tools/direnv/direnv.sh b/tools/direnv/direnv.sh
deleted file mode 100644
index 7e05919596..0000000000
--- a/tools/direnv/direnv.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-eval "\$(direnv hook bash)"
\ No newline at end of file
diff --git a/tools/distrobox/Dockerfile.template b/tools/distrobox/Dockerfile.template
index ac96f3f566..f69f81f027 100644
--- a/tools/distrobox/Dockerfile.template
+++ b/tools/distrobox/Dockerfile.template
@@ -9,17 +9,17 @@ ARG name
 ARG version
 RUN <<EOF
 curl --silent --location --fail "https://github.com/89luca89/distrobox/archive/refs/tags/${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner --strip-components=1 --wildcards \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner --strip-components=1 --wildcards \
     "distrobox-${version}/distrobox-*" \
     "distrobox-${version}/man" \
     "distrobox-${version}/completions" \
     "distrobox-${version}/terminal-distrobox-icon.svg"
 
-mv "${prefix}${target}/bin/man/man1" "${prefix}${target}/share/man/"
-rm -rf "${prefix}${target}/bin/man/"
+mv "${prefix}/bin/man/man1" "${prefix}/share/man/"
+rm -rf "${prefix}/bin/man/"
 
-mv "${prefix}${target}/bin/completions" "${prefix}${target}/share/bash-completion/"
+mv "${prefix}/bin/completions" "${prefix}/share/bash-completion/"
 
-mkdir -p "${prefix}${target}/share/icons/"
-mv "${prefix}${target}/bin/terminal-distrobox-icon.svg" "${prefix}${target}/share/icons/"
+mkdir -p "${prefix}/share/icons/"
+mv "${prefix}/bin/terminal-distrobox-icon.svg" "${prefix}/share/icons/"
 EOF
\ No newline at end of file
diff --git a/tools/diun/Dockerfile.template b/tools/diun/Dockerfile.template
index fe62e151a1..e4b3cea421 100644
--- a/tools/diun/Dockerfile.template
+++ b/tools/diun/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "crazy-max/diun" "v${version}" "diun_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/crazy-max/diun/releases/download/v${version}/diun_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     ./diun
 EOF
\ No newline at end of file
diff --git a/tools/dive/Dockerfile.template b/tools/dive/Dockerfile.template
index 7fa8460ef6..c98199e2bf 100644
--- a/tools/dive/Dockerfile.template
+++ b/tools/dive/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "wagoodman/dive" "v${version}" "dive_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/wagoodman/dive/releases/download/v${version}/dive_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     dive
 EOF
\ No newline at end of file
diff --git a/tools/dnsx/Dockerfile.template b/tools/dnsx/Dockerfile.template
index b52925c9fc..f5735d5407 100644
--- a/tools/dnsx/Dockerfile.template
+++ b/tools/dnsx/Dockerfile.template
@@ -12,6 +12,6 @@ check-github-release-asset "projectdiscovery/dnsx" "v${version}" "dnsx_${version
 url="https://github.com/projectdiscovery/dnsx/releases/download/v${version}/dnsx_${version}_linux_${alt_arch}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/bin" "${filename}" \
+unzip -q -o -d "${prefix}/bin" "${filename}" \
     dnsx
 EOF
\ No newline at end of file
diff --git a/tools/docker-base/Dockerfile.template b/tools/docker-base/Dockerfile.template
index 6877ff5948..68f1d99ee3 100644
--- a/tools/docker-base/Dockerfile.template
+++ b/tools/docker-base/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "docker/base-cli-plugin" "v${version}" "base-cli-plugin_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker/base-cli-plugin/releases/download/v${version}/base-cli-plugin_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/libexec/docker/cli-plugins" --no-same-owner \
     docker-base
 EOF
\ No newline at end of file
diff --git a/tools/docker-compose-switch/Dockerfile.template b/tools/docker-compose-switch/Dockerfile.template
index 07c429ff9f..7ca4c9df0a 100644
--- a/tools/docker-compose-switch/Dockerfile.template
+++ b/tools/docker-compose-switch/Dockerfile.template
@@ -9,9 +9,9 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "docker/compose-switch" "v${version}" "docker-compose-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose-switch" \
+curl --silent --location --fail --output "${prefix}/bin/docker-compose-switch" \
     "https://github.com/docker/compose-switch/releases/download/v${version}/docker-compose-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/docker-compose-switch"
+chmod +x "${prefix}/bin/docker-compose-switch"
 
-ln --symbolic --relative --force "${prefix}${target}/bin/docker-compose-switch" "${prefix}${target}/bin/docker-compose"
+ln --symbolic --relative --force "${prefix}/bin/docker-compose-switch" "${prefix}/bin/docker-compose"
 EOF
\ No newline at end of file
diff --git a/tools/docker-compose-v1/Dockerfile.template b/tools/docker-compose-v1/Dockerfile.template
index d6a5ef3048..844d58a35f 100644
--- a/tools/docker-compose-v1/Dockerfile.template
+++ b/tools/docker-compose-v1/Dockerfile.template
@@ -1,12 +1,15 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM --platform=amd64 ghcr.io/uniget-org/tools/base:latest AS prepare
+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
-COPY docker-compose-cli-plugin ${prefix}${target}/libexec/docker/cli-plugins/docker-compose
 RUN <<EOF
 check-github-release-asset "docker/compose" "${version}" "docker-compose-Linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose" \
+curl --silent --location --fail --output "${prefix}/bin/docker-compose" \
     "https://github.com/docker/compose/releases/download/${version}/docker-compose-Linux-${arch}"
-chmod +x "${prefix}${target}/bin/docker-compose"
+chmod +x "${prefix}/bin/docker-compose"
 EOF
\ No newline at end of file
diff --git a/tools/docker-compose-v1/docker-compose-cli-plugin b/tools/docker-compose-v1/docker-compose-cli-plugin
deleted file mode 100755
index 68a593fc25..0000000000
--- a/tools/docker-compose-v1/docker-compose-cli-plugin
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-docker_cli_plugin_metadata() {
-if [ -z "$DOCKER_COMPOSE_VERSION" ]; then
-    export DOCKER_COMPOSE_VERSION
-        DOCKER_COMPOSE_VERSION="$(docker-compose --version | cut -d " " -f 3 | cut -d "," -f 1)"
-fi
-
-local vendor="Docker"
-local url="https://www.docker.com"
-local description="Define and run multi-container applications"
-cat <<-EOF
-{"SchemaVersion":"0.1.0","Vendor":"${vendor}","Version":"${DOCKER_COMPOSE_VERSION}","ShortDescription":"${description}","URL":"${url}"}
-EOF
-}
-
-case "$1" in
-docker-cli-plugin-metadata)
-    docker_cli_plugin_metadata
-    ;;
-*)
-    shift
-    exec docker-compose "$@"
-    ;;
-esac
\ No newline at end of file
diff --git a/tools/docker-compose/Dockerfile.template b/tools/docker-compose/Dockerfile.template
index 2192fe06ee..8814c80594 100644
--- a/tools/docker-compose/Dockerfile.template
+++ b/tools/docker-compose/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "docker/compose" "v${version}" "docker-compose-linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/libexec/docker/cli-plugins/docker-compose" \
+curl --silent --location --fail --output "${prefix}/libexec/docker/cli-plugins/docker-compose" \
     "https://github.com/docker/compose/releases/download/v${version}/docker-compose-linux-${arch}"
-chmod +x "${prefix}${target}/libexec/docker/cli-plugins/docker-compose"
+chmod +x "${prefix}/libexec/docker/cli-plugins/docker-compose"
 EOF
\ No newline at end of file
diff --git a/tools/docker-credential-acr-env/Dockerfile.template b/tools/docker-credential-acr-env/Dockerfile.template
index f3cd0c7e62..7c432988f4 100644
--- a/tools/docker-credential-acr-env/Dockerfile.template
+++ b/tools/docker-credential-acr-env/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "chrismellard/docker-credential-acr-env" "${version}" "docker-credential-acr-env_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/chrismellard/docker-credential-acr-env/releases/download/${version}/docker-credential-acr-env_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     docker-credential-acr-env
 EOF
\ No newline at end of file
diff --git a/tools/docker-credential-ecr-login/Dockerfile.template b/tools/docker-credential-ecr-login/Dockerfile.template
index e04e600978..731ee767aa 100644
--- a/tools/docker-credential-ecr-login/Dockerfile.template
+++ b/tools/docker-credential-ecr-login/Dockerfile.template
@@ -10,7 +10,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-credential-ecr-login" \
+curl --silent --location --fail --output "${prefix}/bin/docker-credential-ecr-login" \
     "https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${version}/linux-${alt_arch}/docker-credential-ecr-login"
-chmod +x "${prefix}${target}/bin/docker-credential-ecr-login"
+chmod +x "${prefix}/bin/docker-credential-ecr-login"
 EOF
\ No newline at end of file
diff --git a/tools/docker-credential-gcr/Dockerfile.template b/tools/docker-credential-gcr/Dockerfile.template
index a2e7829380..40b6fe361a 100644
--- a/tools/docker-credential-gcr/Dockerfile.template
+++ b/tools/docker-credential-gcr/Dockerfile.template
@@ -11,6 +11,6 @@ ARG version
 
 RUN <<EOF
 curl --silent --location --fail "https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v${version}/docker-credential-gcr_linux_${alt_arch}-${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     docker-credential-gcr
 EOF
\ No newline at end of file
diff --git a/tools/docker-credential-helpers/Dockerfile.template b/tools/docker-credential-helpers/Dockerfile.template
index c98bc018b7..c56ab56f38 100644
--- a/tools/docker-credential-helpers/Dockerfile.template
+++ b/tools/docker-credential-helpers/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "docker/docker-credential-helpers" "v${version}" "docker-credential-pass-v${version}.linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-credential-pass" \
+curl --silent --location --fail --output "${prefix}/bin/docker-credential-pass" \
     "https://github.com/docker/docker-credential-helpers/releases/download/v${version}/docker-credential-pass-v${version}.linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/docker-credential-pass"
+chmod +x "${prefix}/bin/docker-credential-pass"
 EOF
\ No newline at end of file
diff --git a/tools/docker-credential-magic/Dockerfile.template b/tools/docker-credential-magic/Dockerfile.template
index dc0d9150e6..091b9a2932 100644
--- a/tools/docker-credential-magic/Dockerfile.template
+++ b/tools/docker-credential-magic/Dockerfile.template
@@ -12,7 +12,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "docker-credential-magic/docker-credential-magic" "v${version}" "docker-credential-magic_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker-credential-magic/docker-credential-magic/releases/download/v${version}/docker-credential-magic_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     docker-credential-magic \
     docker-credential-magician
 EOF
\ No newline at end of file
diff --git a/tools/docker-gen/Dockerfile.template b/tools/docker-gen/Dockerfile.template
index 1868200ffe..747debf631 100644
--- a/tools/docker-gen/Dockerfile.template
+++ b/tools/docker-gen/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "nginx-proxy/docker-gen" "${version}" "docker-gen-alpine-linux-${alt_arch}-${version}.tar.gz"
 curl --silent --location --fail "https://github.com/nginx-proxy/docker-gen/releases/download/${version}/docker-gen-alpine-linux-${alt_arch}-${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/docker-index/Dockerfile.template b/tools/docker-index/Dockerfile.template
index 80cb616b02..982ec64e97 100644
--- a/tools/docker-index/Dockerfile.template
+++ b/tools/docker-index/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "docker/index-cli-plugin" "v${version}" "docker-index_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker/index-cli-plugin/releases/download/v${version}/docker-index_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/libexec/docker/cli-plugins" --no-same-owner \
     docker-index
-"${prefix}${target}/libexec/docker/cli-plugins/docker-index" completion bash | sed "s|${prefix}||g" >"${prefix}${target}/share/bash-completion/completions/docker-index"
-"${prefix}${target}/libexec/docker/cli-plugins/docker-index" completion fish | sed "s|${prefix}||g" >"${prefix}${target}/share/fish/vendor_completions.d/docker-index.fish"
-"${prefix}${target}/libexec/docker/cli-plugins/docker-index" completion zsh  | sed "s|${prefix}||g" >"${prefix}${target}/share/zsh/vendor-completions/_docker-index"
+"${prefix}/libexec/docker/cli-plugins/docker-index" completion bash | sed "s|${prefix}||g" >"${prefix}/share/bash-completion/completions/docker-index"
+"${prefix}/libexec/docker/cli-plugins/docker-index" completion fish | sed "s|${prefix}||g" >"${prefix}/share/fish/vendor_completions.d/docker-index.fish"
+"${prefix}/libexec/docker/cli-plugins/docker-index" completion zsh  | sed "s|${prefix}||g" >"${prefix}/share/zsh/vendor-completions/_docker-index"
 EOF
\ No newline at end of file
diff --git a/tools/docker-lock/Dockerfile.template b/tools/docker-lock/Dockerfile.template
index 82b0857570..04ea4720be 100644
--- a/tools/docker-lock/Dockerfile.template
+++ b/tools/docker-lock/Dockerfile.template
@@ -27,6 +27,6 @@ check-github-release-asset "safe-waters/docker-lock" "v${version}" "docker-lock_
 
 echo "### Downloading docker-lock ${version}"
 curl --silent --location --fail "https://github.com/safe-waters/docker-lock/releases/download/v${version}/docker-lock_${version}_Linux_${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     docker-lock
 EOF
\ No newline at end of file
diff --git a/tools/docker-machine/Dockerfile.template b/tools/docker-machine/Dockerfile.template
index 97d318b721..4e509011fe 100644
--- a/tools/docker-machine/Dockerfile.template
+++ b/tools/docker-machine/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "docker/machine" "v${version}" "docker-machine-Linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/docker-machine" \
+curl --silent --location --fail --output "${prefix}/bin/docker-machine" \
     "https://github.com/docker/machine/releases/download/v${version}/docker-machine-Linux-${arch}"
-chmod +x "${prefix}${target}/bin/docker-machine"
+chmod +x "${prefix}/bin/docker-machine"
 EOF
\ No newline at end of file
diff --git a/tools/docker-manpages/Dockerfile.template b/tools/docker-manpages/Dockerfile.template
index 19e0044f49..4614659a3a 100644
--- a/tools/docker-manpages/Dockerfile.template
+++ b/tools/docker-manpages/Dockerfile.template
@@ -23,6 +23,6 @@ ENV GO111MODULE=auto \
     DISABLE_WARN_OUTSIDE_CONTAINER=1 \
     GOPATH=/go
 RUN make manpages
-RUN cp -r man/man1 "${prefix}${target}/share/man/" \
- && cp -r man/man5 "${prefix}${target}/share/man/" \
- && cp -r man/man8 "${prefix}${target}/share/man/"
+RUN cp -r man/man1 "${prefix}/share/man/" \
+ && cp -r man/man5 "${prefix}/share/man/" \
+ && cp -r man/man8 "${prefix}/share/man/"
diff --git a/tools/docker-preview/Dockerfile.template b/tools/docker-preview/Dockerfile.template
index 9b3e678a08..a3a7497502 100644
--- a/tools/docker-preview/Dockerfile.template
+++ b/tools/docker-preview/Dockerfile.template
@@ -11,34 +11,34 @@ ARG version
 
 RUN <<EOF
 mkdir -p \
-    "${prefix}${target}/libexec/${name}/bin" \
+    "${prefix}/libexec/${name}/bin" \
     "${prefix}${uniget_contrib}/${name}/sysvinit/debian" \
     "${prefix}${uniget_contrib}/${name}/sysvinit/redhat" \
     "${prefix}${uniget_contrib}/${name}/openrc"
 EOF
 
-COPY daemon.json ${prefix}${target}/etc/docker-preview/
-COPY --chmod=0755 <<EOF ${prefix}${target}/bin/docker-preview
+COPY daemon.json ${prefix}/etc/docker-preview/
+COPY --chmod=0755 <<EOF ${prefix}/bin/docker-preview
 #!/bin/bash
 set -o errexit
 export DOCKER_HOST=unix:///var/run/docker-preview.sock
-exec ${target}/libexec/${name}/bin/docker "\$@"
+exec /libexec/${name}/bin/docker "\$@"
 EOF
 
 RUN <<EOF
 curl --silent --location --fail "https://download.docker.com/linux/static/test/${arch}/docker-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
+| tar --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
 curl --silent --location --fail "https://download.docker.com/linux/static/test/${arch}/docker-rootless-extras-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
+| tar --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
 EOF
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/docker.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/docker.service" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/systemd/docker.service"
-sed -i "/^\[Service\]/a Environment=PATH=${target}/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -E "s|^(ExecStart=)/usr/bin/dockerd(.+)$|\1${target}/libexec/${name}/bin/dockerd|" "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -n '/Type=notify/!p' "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -n '/Requires=docker.socket/!p' "${prefix}${target}/etc/systemd/system/docker.service"
+sed -i "/^\[Service\]/a Environment=PATH=/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}/etc/systemd/system/docker.service"
+sed -i -E "s|^(ExecStart=)/usr/bin/dockerd(.+)$|\1/libexec/${name}/bin/dockerd|" "${prefix}/etc/systemd/system/docker.service"
+sed -i -n '/Type=notify/!p' "${prefix}/etc/systemd/system/docker.service"
+sed -i -n '/Requires=docker.socket/!p' "${prefix}/etc/systemd/system/docker.service"
 EOF
 
 RUN <<EOF
@@ -48,8 +48,8 @@ echo "DOCKER_OPTS=--config-file=/etc/${name}/daemon.json" >>"${prefix}${uniget_c
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
-sed -i -E "s|^(export PATH=)|\1${target}/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
-sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=${target}/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
+sed -i -E "s|^(export PATH=)|\1/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
+sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 sed -i -E "s|^BASE=docker|BASE=${name}|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 
@@ -58,16 +58,16 @@ curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sys
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
-sed -i -E "s|(^prog=)|export PATH="${target}/libexec/${name}/bin:${target}/sbin:${target}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
-sed -i -E "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
+sed -i -E "s|(^prog=)|export PATH="/libexec/${name}/bin:/sbin:/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
+sed -i -E "s|/usr/bin/dockerd|/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
-sed -i "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
+sed -i "s|/usr/bin/dockerd|/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
-sed -i -E "s|^(command=)|export PATH="${target}/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
-sed -i "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
+sed -i -E "s|^(command=)|export PATH="/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
+sed -i "s|/usr/bin/dockerd|/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
 EOF
diff --git a/tools/docker-sbom/Dockerfile.template b/tools/docker-sbom/Dockerfile.template
index d1cd82f2d2..fc72051968 100644
--- a/tools/docker-sbom/Dockerfile.template
+++ b/tools/docker-sbom/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "docker/sbom-cli-plugin" "v${version}" "sbom-cli-plugin_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker/sbom-cli-plugin/releases/download/v${version}/sbom-cli-plugin_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/libexec/docker/cli-plugins" --no-same-owner \
     docker-sbom
 EOF
\ No newline at end of file
diff --git a/tools/docker-scout/Dockerfile.template b/tools/docker-scout/Dockerfile.template
index 0df586a4a1..7ecca718b4 100644
--- a/tools/docker-scout/Dockerfile.template
+++ b/tools/docker-scout/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "docker/scout-cli" "v${version}" "docker-scout_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker/scout-cli/releases/download/v${version}/docker-scout_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/libexec/docker/cli-plugins/" --no-same-owner \
     docker-scout
 
-"${prefix}${target}/libexec/docker/cli-plugins/docker-scout" completion bash >"${prefix}${target}/share/bash-completion/completions/docker-scout"
-"${prefix}${target}/libexec/docker/cli-plugins/docker-scout" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/docker-scout.fish"
-"${prefix}${target}/libexec/docker/cli-plugins/docker-scout" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_docker-scout"
+"${prefix}/libexec/docker/cli-plugins/docker-scout" completion bash >"${prefix}/share/bash-completion/completions/docker-scout"
+"${prefix}/libexec/docker/cli-plugins/docker-scout" completion fish >"${prefix}/share/fish/vendor_completions.d/docker-scout.fish"
+"${prefix}/libexec/docker/cli-plugins/docker-scout" completion zsh >"${prefix}/share/zsh/vendor-completions/_docker-scout"
 EOF
\ No newline at end of file
diff --git a/tools/docker-slim/Dockerfile.template b/tools/docker-slim/Dockerfile.template
index 2feed40e6e..fd2b93a6c9 100644
--- a/tools/docker-slim/Dockerfile.template
+++ b/tools/docker-slim/Dockerfile.template
@@ -21,5 +21,5 @@ case "${alt_arch}" in
         ;;
 esac
 curl --silent --location --fail "https://downloads.dockerslim.com/releases/1.40.0/dist_linux${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/docker-stable/Dockerfile.template b/tools/docker-stable/Dockerfile.template
index c057eadc49..7b6b9ec772 100644
--- a/tools/docker-stable/Dockerfile.template
+++ b/tools/docker-stable/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 mkdir -p \
-    "${prefix}${target}/libexec/${name}/bin" \
+    "${prefix}/libexec/${name}/bin" \
     "${prefix}${uniget_contrib}/${name}/sysvinit/debian" \
     "${prefix}${uniget_contrib}/${name}/sysvinit/redhat" \
     "${prefix}${uniget_contrib}/${name}/openrc"
@@ -20,34 +20,34 @@ EOF
 RUN <<EOF
 check-download "https://download.docker.com/linux/static/stable/${arch}/docker-${version}.tgz"
 curl --silent --location --fail "https://download.docker.com/linux/static/stable/${arch}/docker-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
-mv "${prefix}${target}/libexec/${name}/bin/dockerd"      "${prefix}${target}/bin/"
-mv "${prefix}${target}/libexec/${name}/bin/docker"       "${prefix}${target}/bin/"
-mv "${prefix}${target}/libexec/${name}/bin/docker-proxy" "${prefix}${target}/bin/"
+| tar --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
+mv "${prefix}/libexec/${name}/bin/dockerd"      "${prefix}/bin/"
+mv "${prefix}/libexec/${name}/bin/docker"       "${prefix}/bin/"
+mv "${prefix}/libexec/${name}/bin/docker-proxy" "${prefix}/bin/"
 
 check-download "https://download.docker.com/linux/static/stable/${arch}/docker-rootless-extras-${version}.tgz"
 curl --silent --location --fail "https://download.docker.com/linux/static/stable/${arch}/docker-rootless-extras-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
-mv "${prefix}${target}/libexec/${name}/bin/dockerd-rootless.sh"           "${prefix}${target}/bin/"
-mv "${prefix}${target}/libexec/${name}/bin/dockerd-rootless-setuptool.sh" "${prefix}${target}/bin/"
+| tar --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
+mv "${prefix}/libexec/${name}/bin/dockerd-rootless.sh"           "${prefix}/bin/"
+mv "${prefix}/libexec/${name}/bin/dockerd-rootless-setuptool.sh" "${prefix}/bin/"
 EOF
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/share/bash-completion/completions/docker" \
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/docker" \
     "https://github.com/docker/cli/raw/v${version}/contrib/completion/bash/docker"
-curl --silent --location --fail --output "${prefix}${target}/share/fish/vendor_completions.d/docker.fish" \
+curl --silent --location --fail --output "${prefix}/share/fish/vendor_completions.d/docker.fish" \
     "https://github.com/docker/cli/raw/v${version}/contrib/completion/fish/docker.fish"
-curl --silent --location --fail --output "${prefix}${target}/share/zsh/vendor-completions/_docker" \
+curl --silent --location --fail --output "${prefix}/share/zsh/vendor-completions/_docker" \
     "https://github.com/docker/cli/raw/v${version}/contrib/completion/zsh/_docker"
 EOF
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/docker.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/docker.service" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/systemd/docker.service"
-sed -i "/^\[Service\]/a Environment=PATH=${target}/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -E "s|^(ExecStart=)/usr/bin/dockerd(.+)$|\1${target}/libexec/${name}/bin/dockerd|" "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -n '/Type=notify/!p' "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -n '/Requires=docker.socket/!p' "${prefix}${target}/etc/systemd/system/docker.service"
+sed -i "/^\[Service\]/a Environment=PATH=/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}/etc/systemd/system/docker.service"
+sed -i -E "s|^(ExecStart=)/usr/bin/dockerd(.+)$|\1/libexec/${name}/bin/dockerd|" "${prefix}/etc/systemd/system/docker.service"
+sed -i -n '/Type=notify/!p' "${prefix}/etc/systemd/system/docker.service"
+sed -i -n '/Requires=docker.socket/!p' "${prefix}/etc/systemd/system/docker.service"
 EOF
 
 RUN <<EOF
@@ -56,8 +56,8 @@ curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sys
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
-sed -i -E "s|^(export PATH=)|\1${target}/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
-sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
+sed -i -E "s|^(export PATH=)|\1/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
+sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" \
@@ -65,16 +65,16 @@ curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sys
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
-sed -i -E "s|(^prog=)|export PATH="${target}/libexec/${name}/bin:${target}/sbin:${target}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
-sed -i -E "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
+sed -i -E "s|(^prog=)|export PATH="/libexec/${name}/bin:/sbin:/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
+sed -i -E "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
-sed -i "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
+sed -i "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
-sed -i -E "s|^(command=)|export PATH="${target}/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
-sed -i "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
+sed -i -E "s|^(command=)|export PATH="/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
+sed -i "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
 EOF
\ No newline at end of file
diff --git a/tools/docker/Dockerfile.template b/tools/docker/Dockerfile.template
index a2d80f2138..1b3088f3d8 100644
--- a/tools/docker/Dockerfile.template
+++ b/tools/docker/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 mkdir -p \
-    "${prefix}${target}/libexec/${name}/bin" \
+    "${prefix}/libexec/${name}/bin" \
     "${prefix}${uniget_contrib}/${name}/sysvinit/debian" \
     "${prefix}${uniget_contrib}/${name}/sysvinit/redhat" \
     "${prefix}${uniget_contrib}/${name}/openrc"
@@ -20,32 +20,32 @@ EOF
 RUN <<EOF
 check-download "https://download.docker.com/linux/static/stable/${arch}/docker-${version}.tgz"
 curl --silent --location --fail "https://download.docker.com/linux/static/stable/${arch}/docker-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
-mv "${prefix}${target}/libexec/${name}/bin/dockerd"      "${prefix}${target}/bin/"
-mv "${prefix}${target}/libexec/${name}/bin/docker"       "${prefix}${target}/bin/"
-mv "${prefix}${target}/libexec/${name}/bin/docker-proxy" "${prefix}${target}/bin/"
+| tar --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
+mv "${prefix}/libexec/${name}/bin/dockerd"      "${prefix}/bin/"
+mv "${prefix}/libexec/${name}/bin/docker"       "${prefix}/bin/"
+mv "${prefix}/libexec/${name}/bin/docker-proxy" "${prefix}/bin/"
 
 check-download "https://download.docker.com/linux/static/stable/${arch}/docker-rootless-extras-${version}.tgz"
 curl --silent --location --fail "https://download.docker.com/linux/static/stable/${arch}/docker-rootless-extras-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
-mv "${prefix}${target}/libexec/${name}/bin/dockerd-rootless.sh"           "${prefix}${target}/bin/"
-mv "${prefix}${target}/libexec/${name}/bin/dockerd-rootless-setuptool.sh" "${prefix}${target}/bin/"
+| tar --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
+mv "${prefix}/libexec/${name}/bin/dockerd-rootless.sh"           "${prefix}/bin/"
+mv "${prefix}/libexec/${name}/bin/dockerd-rootless-setuptool.sh" "${prefix}/bin/"
 EOF
 
 RUN <<EOF
-"${prefix}${target}/bin/docker" completion bash >"${prefix}${target}/share/bash-completion/completions/docker"
-"${prefix}${target}/bin/docker" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/docker.fish"
-"${prefix}${target}/bin/docker" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_docker"
+"${prefix}/bin/docker" completion bash >"${prefix}/share/bash-completion/completions/docker"
+"${prefix}/bin/docker" completion fish >"${prefix}/share/fish/vendor_completions.d/docker.fish"
+"${prefix}/bin/docker" completion zsh >"${prefix}/share/zsh/vendor-completions/_docker"
 EOF
 
 RUN <<EOF
 check-download "https://github.com/moby/moby/raw/v${version}/contrib/init/systemd/docker.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/docker.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/docker.service" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/systemd/docker.service"
-sed -i "/^\[Service\]/a Environment=PATH=${target}/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -E "s|^(ExecStart=)/usr/bin/dockerd(.+)$|\1${target}/bin/dockerd|" "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -n '/Type=notify/!p' "${prefix}${target}/etc/systemd/system/docker.service"
-sed -i -n '/Requires=docker.socket/!p' "${prefix}${target}/etc/systemd/system/docker.service"
+sed -i "/^\[Service\]/a Environment=PATH=/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}/etc/systemd/system/docker.service"
+sed -i -E "s|^(ExecStart=)/usr/bin/dockerd(.+)$|\1/bin/dockerd|" "${prefix}/etc/systemd/system/docker.service"
+sed -i -n '/Type=notify/!p' "${prefix}/etc/systemd/system/docker.service"
+sed -i -n '/Requires=docker.socket/!p' "${prefix}/etc/systemd/system/docker.service"
 EOF
 
 RUN <<EOF
@@ -54,8 +54,8 @@ curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sys
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
-sed -i -E "s|^(export PATH=)|\1${target}/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
-sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
+sed -i -E "s|^(export PATH=)|\1/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
+sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" \
@@ -63,16 +63,16 @@ curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sys
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
-sed -i -E "s|(^prog=)|export PATH="${target}/libexec/${name}/bin:${target}/sbin:${target}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
-sed -i -E "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
+sed -i -E "s|(^prog=)|export PATH="/libexec/${name}/bin:/sbin:/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
+sed -i -E "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
-sed -i "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
+sed -i "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
 
 curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
-sed -i -E "s|^(command=)|export PATH="${target}/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
-sed -i "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
+sed -i -E "s|^(command=)|export PATH="/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
+sed -i "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
 EOF
\ No newline at end of file
diff --git a/tools/dockerfilegraph/Dockerfile.template b/tools/dockerfilegraph/Dockerfile.template
index a75cdc4483..e49564771f 100644
--- a/tools/dockerfilegraph/Dockerfile.template
+++ b/tools/dockerfilegraph/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "patrickhoefler/dockerfilegraph" "v${version}" "dockerfilegraph_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/patrickhoefler/dockerfilegraph/releases/download/v${version}/dockerfilegraph_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     dockerfilegraph
 EOF
\ No newline at end of file
diff --git a/tools/dockle/Dockerfile.template b/tools/dockle/Dockerfile.template
index 254995dac2..32675d7e09 100644
--- a/tools/dockle/Dockerfile.template
+++ b/tools/dockle/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "goodwithtech/dockle" "v${version}" "dockle_${version}_Linux-64bit.tar.gz"
 curl --silent --location --fail "https://github.com/goodwithtech/dockle/releases/download/v${version}/dockle_${version}_Linux-64bit.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     dockle
 EOF
\ No newline at end of file
diff --git a/tools/docuum/Dockerfile.template b/tools/docuum/Dockerfile.template
index ad27a2778d..08975620aa 100644
--- a/tools/docuum/Dockerfile.template
+++ b/tools/docuum/Dockerfile.template
@@ -18,9 +18,9 @@ WORKDIR /tmp/github.com/stepchowfun/docuum
 ARG name
 ARG version
 RUN <<EOF
-source "${target}/etc/profile.d/cargo.sh"
+source "/etc/profile.d/cargo.sh"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/stepchowfun/docuum .
 export RUSTFLAGS='-C target-feature=+crt-static'
 cargo build --release --target x86_64-unknown-linux-gnu
-cp target/x86_64-unknown-linux-gnu/release/docuum "${prefix}${target}/bin/"
+cp target/x86_64-unknown-linux-gnu/release/docuum "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/dot/Dockerfile.template b/tools/dot/Dockerfile.template
index a68b4b9c58..2eaa81305b 100644
--- a/tools/dot/Dockerfile.template
+++ b/tools/dot/Dockerfile.template
@@ -21,5 +21,5 @@ ARG version
 RUN <<EOF
 check-clone https://github.com/goccy/go-graphviz "v${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/goccy/go-graphviz .
-go build -ldflags '-extldflags "-static"' -o "${prefix}${target}/bin/dot" ./cmd/dot
+go build -ldflags '-extldflags "-static"' -o "${prefix}/bin/dot" ./cmd/dot
 EOF
\ No newline at end of file
diff --git a/tools/dotnet/Dockerfile.template b/tools/dotnet/Dockerfile.template
index 5c3660e975..1283ef93a7 100644
--- a/tools/dotnet/Dockerfile.template
+++ b/tools/dotnet/Dockerfile.template
@@ -9,6 +9,6 @@ ARG name
 ARG version
 RUN <<EOF
 curl --silent --location --fail --remote-name https://dot.net/v1/dotnet-install.sh
-bash dotnet-install.sh --channel STS --version ${version} --install-dir "${prefix}${target}/opt/dotnet"
-ln --symbolic --relative --force "${prefix}${target}/opt/dotnet/dotnet" "${prefix}${target}/bin/dotnet"
+bash dotnet-install.sh --channel STS --version ${version} --install-dir "${prefix}/opt/dotnet"
+ln --symbolic --relative --force "${prefix}/opt/dotnet/dotnet" "${prefix}/bin/dotnet"
 EOF
\ No newline at end of file
diff --git a/tools/dry/Dockerfile.template b/tools/dry/Dockerfile.template
index a4d417c399..3ed655ee9e 100644
--- a/tools/dry/Dockerfile.template
+++ b/tools/dry/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "moncho/dry" "v${version}" "dry-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/dry" \
+curl --silent --location --fail --output "${prefix}/bin/dry" \
     "https://github.com/moncho/dry/releases/download/v${version}/dry-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/dry"
+chmod +x "${prefix}/bin/dry"
 EOF
\ No newline at end of file
diff --git a/tools/dua/Dockerfile.template b/tools/dua/Dockerfile.template
index 07c8ef18e3..86d3e9eb5d 100644
--- a/tools/dua/Dockerfile.template
+++ b/tools/dua/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "Byron/dua-cli" "v${version}" "dua-v${version}-${arch}-unknown-linux-musl.tar.gz"
 curl --silent --location --fail "https://github.com/Byron/dua-cli/releases/download/v${version}/dua-v${version}-${arch}-unknown-linux-musl.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     dua-v${version}-${arch}-unknown-linux-musl/dua
 EOF
\ No newline at end of file
diff --git a/tools/duf/Dockerfile.template b/tools/duf/Dockerfile.template
index b4ac257d38..7051d3cd03 100644
--- a/tools/duf/Dockerfile.template
+++ b/tools/duf/Dockerfile.template
@@ -27,6 +27,6 @@ check-github-release-asset "muesli/duf" "v${version}" "duf_${version}_linux_${ar
 
 echo "### Downloading duf ${version}"
 curl --silent --verbose --location --fail "https://github.com/muesli/duf/releases/download/v${version}/duf_${version}_linux_${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     duf
 EOF
\ No newline at end of file
diff --git a/tools/duffle/Dockerfile.template b/tools/duffle/Dockerfile.template
index 67efea1b2a..75b2bc47e7 100644
--- a/tools/duffle/Dockerfile.template
+++ b/tools/duffle/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "cnabio/duffle" "${version}" "duffle-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/duffle" \
+curl --silent --location --fail --output "${prefix}/bin/duffle" \
     "https://github.com/cnabio/duffle/releases/download/${version}/duffle-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/duffle"
+chmod +x "${prefix}/bin/duffle"
 EOF
\ No newline at end of file
diff --git a/tools/dumb-init/Dockerfile.template b/tools/dumb-init/Dockerfile.template
index b3669909c1..cae89cc29d 100644
--- a/tools/dumb-init/Dockerfile.template
+++ b/tools/dumb-init/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "Yelp/dumb-init" "v${version}" "dumb-init_${version}_${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/dumb-init" \
+curl --silent --location --fail --output "${prefix}/bin/dumb-init" \
     "https://github.com/Yelp/dumb-init/releases/download/v${version}/dumb-init_${version}_${arch}"
-chmod +x "${prefix}${target}/bin/dumb-init"
+chmod +x "${prefix}/bin/dumb-init"
 EOF
\ No newline at end of file
diff --git a/tools/dyff/Dockerfile.template b/tools/dyff/Dockerfile.template
index c09227ea78..960bf6f6fb 100644
--- a/tools/dyff/Dockerfile.template
+++ b/tools/dyff/Dockerfile.template
@@ -12,9 +12,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "homeport/dyff" "v${version}" "dyff_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/homeport/dyff/releases/download/v${version}/dyff_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     dyff
-"${prefix}${target}/bin/dyff" completion bash >"${prefix}${target}/share/bash-completion/completions/dyff"
-"${prefix}${target}/bin/dyff" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/dyff.fish"
-"${prefix}${target}/bin/dyff" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_dyff"
+"${prefix}/bin/dyff" completion bash >"${prefix}/share/bash-completion/completions/dyff"
+"${prefix}/bin/dyff" completion fish >"${prefix}/share/fish/vendor_completions.d/dyff.fish"
+"${prefix}/bin/dyff" completion zsh >"${prefix}/share/zsh/vendor-completions/_dyff"
 EOF
\ No newline at end of file