From b17cab818d647d098bb3189e0494e6dd987407f6 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 21 Dec 2023 14:58:01 +0100
Subject: [PATCH 1/3] Remove target for w* #2213

---
 tools/wagi/Dockerfile.template          |  8 +++++---
 tools/wait-for/Dockerfile.template      |  8 +++++---
 tools/walk/Dockerfile.template          |  8 +++++---
 tools/warp/Dockerfile.template          |  4 +---
 tools/wasmedge/Dockerfile.template      |  8 +++++---
 tools/wasmer/Dockerfile.template        |  8 +++++---
 tools/wasmi/Dockerfile.template         | 10 ++++++----
 tools/wasmtime/Dockerfile.template      |  8 +++++---
 tools/watchexec/Dockerfile.template     |  8 +++++---
 tools/watchtower/Dockerfile.template    |  7 +++++--
 tools/webhookd/Dockerfile.template      |  8 +++++---
 tools/websocat/Dockerfile.template      |  8 +++++---
 tools/wg/Dockerfile.template            |  8 +++++---
 tools/whalebrew/Dockerfile.template     |  8 +++++---
 tools/whalesay/Dockerfile.template      |  8 +++++---
 tools/win-gpg-agent/Dockerfile.template |  7 +++++--
 tools/wireguard-go/Dockerfile.template  | 12 +++++++-----
 tools/witness/Dockerfile.template       |  8 +++++---
 tools/wksctl/Dockerfile.template        |  8 +++++---
 tools/woke/Dockerfile.template          |  8 +++++---
 tools/woodpecker/Dockerfile.template    |  7 +++++--
 tools/wordcloud/Dockerfile.template     | 12 +++++++-----
 tools/wsl-open/Dockerfile.template      |  7 +++++--
 tools/wslu/Dockerfile.template          | 10 ++++++----
 24 files changed, 122 insertions(+), 74 deletions(-)

diff --git a/tools/wagi/Dockerfile.template b/tools/wagi/Dockerfile.template
index 9c0dc8aa1..549381b93 100644
--- a/tools/wagi/Dockerfile.template
+++ b/tools/wagi/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/wait-for/Dockerfile.template b/tools/wait-for/Dockerfile.template
index 1bdd56b3d..80618ec6b 100644
--- a/tools/wait-for/Dockerfile.template
+++ b/tools/wait-for/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/walk/Dockerfile.template b/tools/walk/Dockerfile.template
index e2b46d9a9..fe48ab175 100644
--- a/tools/walk/Dockerfile.template
+++ b/tools/walk/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/warp/Dockerfile.template b/tools/warp/Dockerfile.template
index 0244e2c28..34a8cf20a 100644
--- a/tools/warp/Dockerfile.template
+++ b/tools/warp/Dockerfile.template
@@ -1,8 +1,6 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS download
+FROM ghcr.io/uniget-org/tools/base:latest AS download
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/wasmedge/Dockerfile.template b/tools/wasmedge/Dockerfile.template
index 3ed576306..09e446c71 100644
--- a/tools/wasmedge/Dockerfile.template
+++ b/tools/wasmedge/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/wasmer/Dockerfile.template b/tools/wasmer/Dockerfile.template
index dc9e68f63..0f6d804dc 100644
--- a/tools/wasmer/Dockerfile.template
+++ b/tools/wasmer/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/wasmi/Dockerfile.template b/tools/wasmi/Dockerfile.template
index ca2212ad9..7193c1855 100644
--- a/tools/wasmi/Dockerfile.template
+++ b/tools/wasmi/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/rust:latest AS rust
 
-FROM ghcr.io/uniget-org/tools/rust:${ref} AS rust
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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" ]
 COPY --from=rust / /
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
diff --git a/tools/wasmtime/Dockerfile.template b/tools/wasmtime/Dockerfile.template
index 076678c10..639f2f778 100644
--- a/tools/wasmtime/Dockerfile.template
+++ b/tools/wasmtime/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/watchexec/Dockerfile.template b/tools/watchexec/Dockerfile.template
index 3834b9389..606abdcd8 100644
--- a/tools/watchexec/Dockerfile.template
+++ b/tools/watchexec/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/watchtower/Dockerfile.template b/tools/watchtower/Dockerfile.template
index 055aaca22..5b27e5a47 100644
--- a/tools/watchtower/Dockerfile.template
+++ b/tools/watchtower/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
diff --git a/tools/webhookd/Dockerfile.template b/tools/webhookd/Dockerfile.template
index 1d8e2087c..866a84360 100644
--- a/tools/webhookd/Dockerfile.template
+++ b/tools/webhookd/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/websocat/Dockerfile.template b/tools/websocat/Dockerfile.template
index 5c9f64ca7..f97592fb1 100644
--- a/tools/websocat/Dockerfile.template
+++ b/tools/websocat/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/wg/Dockerfile.template b/tools/wg/Dockerfile.template
index 661e2e3cd..c4b7ad8a8 100644
--- a/tools/wg/Dockerfile.template
+++ b/tools/wg/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/whalebrew/Dockerfile.template b/tools/whalebrew/Dockerfile.template
index b34be5ec5..8b78d942f 100644
--- a/tools/whalebrew/Dockerfile.template
+++ b/tools/whalebrew/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/whalesay/Dockerfile.template b/tools/whalesay/Dockerfile.template
index 94e3bc1b4..37af9fc08 100644
--- a/tools/whalesay/Dockerfile.template
+++ b/tools/whalesay/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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.cow ${prefix}${target}/share/cows/
diff --git a/tools/win-gpg-agent/Dockerfile.template b/tools/win-gpg-agent/Dockerfile.template
index d1bfe5aed..39f430c04 100644
--- a/tools/win-gpg-agent/Dockerfile.template
+++ b/tools/win-gpg-agent/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
diff --git a/tools/wireguard-go/Dockerfile.template b/tools/wireguard-go/Dockerfile.template
index 56f736965..ac83c7edd 100644
--- a/tools/wireguard-go/Dockerfile.template
+++ b/tools/wireguard-go/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go:latest AS go
+FROM ghcr.io/uniget-org/tools/make:latest AS make
 
-FROM ghcr.io/uniget-org/tools/go:${ref} AS go
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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" ]
 COPY --link --from=go / /
 COPY --link --from=make / /
 WORKDIR /go/src/git.zx2c4.com/wireguard-go
diff --git a/tools/witness/Dockerfile.template b/tools/witness/Dockerfile.template
index f7f5e1827..6e9666a43 100644
--- a/tools/witness/Dockerfile.template
+++ b/tools/witness/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/wksctl/Dockerfile.template b/tools/wksctl/Dockerfile.template
index 35fabc087..9db13d609 100644
--- a/tools/wksctl/Dockerfile.template
+++ b/tools/wksctl/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/woke/Dockerfile.template b/tools/woke/Dockerfile.template
index 1723a8737..14834251b 100644
--- a/tools/woke/Dockerfile.template
+++ b/tools/woke/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
 RUN <<EOF
diff --git a/tools/woodpecker/Dockerfile.template b/tools/woodpecker/Dockerfile.template
index ab864cbf2..b92cd7b1c 100644
--- a/tools/woodpecker/Dockerfile.template
+++ b/tools/woodpecker/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
diff --git a/tools/wordcloud/Dockerfile.template b/tools/wordcloud/Dockerfile.template
index f72fba8cb..8ae65ad22 100644
--- a/tools/wordcloud/Dockerfile.template
+++ b/tools/wordcloud/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/shiv:latest AS shiv
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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" ]
 #COPY --link --from=python / /
 COPY --link --from=shiv / /
 RUN <<EOF
diff --git a/tools/wsl-open/Dockerfile.template b/tools/wsl-open/Dockerfile.template
index 55a08a68c..d3f38c2d4 100644
--- a/tools/wsl-open/Dockerfile.template
+++ b/tools/wsl-open/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} 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
diff --git a/tools/wslu/Dockerfile.template b/tools/wslu/Dockerfile.template
index 5e44f556a..b8c8a111c 100644
--- a/tools/wslu/Dockerfile.template
+++ b/tools/wslu/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/make:latest AS make
 
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-
-FROM ghcr.io/uniget-org/tools/base:${ref} 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" ]
 COPY --link --from=make / /
 WORKDIR /tmp/wslu
 ARG name

From fc2dea78a98db188f09d0736d12f8c74aecc701d Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 15:17:39 +0100
Subject: [PATCH 2/3] Removed target variable #2213

---
 tools/wagi/Dockerfile.template          |  8 ++++----
 tools/wait-for/Dockerfile.template      |  8 ++++----
 tools/walk/Dockerfile.template          |  4 ++--
 tools/warp/Dockerfile.template          |  4 ++--
 tools/wasmedge/Dockerfile.template      |  2 +-
 tools/wasmer/Dockerfile.template        |  2 +-
 tools/wasmi/Dockerfile.template         |  4 ++--
 tools/wasmtime/Dockerfile.template      |  2 +-
 tools/watchexec/Dockerfile.template     | 10 +++++-----
 tools/watchtower/Dockerfile.template    |  8 ++++----
 tools/webhookd/Dockerfile.template      |  2 +-
 tools/websocat/Dockerfile.template      |  4 ++--
 tools/wg/Dockerfile.template            |  2 +-
 tools/whalebrew/Dockerfile.template     | 10 +++++-----
 tools/whalesay/Dockerfile.template      |  4 ++--
 tools/win-gpg-agent/Dockerfile.template |  2 +-
 tools/wireguard-go/Dockerfile.template  |  2 +-
 tools/witness/Dockerfile.template       |  8 ++++----
 tools/wksctl/Dockerfile.template        | 10 +++++-----
 tools/woke/Dockerfile.template          |  8 ++++----
 tools/woodpecker/Dockerfile.template    |  6 +++---
 tools/wordcloud/Dockerfile.template     |  6 +++---
 tools/wsl-open/Dockerfile.template      |  6 +++---
 tools/wslu/Dockerfile.template          |  2 +-
 24 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/tools/wagi/Dockerfile.template b/tools/wagi/Dockerfile.template
index 549381b93..9479d0736 100644
--- a/tools/wagi/Dockerfile.template
+++ b/tools/wagi/Dockerfile.template
@@ -22,13 +22,13 @@ case "${alt_arch}" in
 esac
 check-github-release-asset "deislabs/wagi" "v${version}" "wagi-v${version}-linux-${arch_suffix}.tar.gz"
 curl --silent --location --fail "https://github.com/deislabs/wagi/releases/download/v${version}/wagi-v${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 \
     wagi
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${prefix}${target}/share/bash-completion/completions/foo"
-#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
-#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo"
+#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo"
+#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish"
+#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo"
 #EOF
\ No newline at end of file
diff --git a/tools/wait-for/Dockerfile.template b/tools/wait-for/Dockerfile.template
index 80618ec6b..3066b375f 100644
--- a/tools/wait-for/Dockerfile.template
+++ b/tools/wait-for/Dockerfile.template
@@ -10,13 +10,13 @@ ARG version
 RUN <<EOF
 check-github-release-asset "dnnrly/wait-for" "v${version}" "wait-for_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/dnnrly/wait-for/releases/download/v${version}/wait-for_${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 \
     wait-for
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${prefix}${target}/share/bash-completion/completions/foo"
-#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
-#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo"
+#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo"
+#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish"
+#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo"
 #EOF
\ No newline at end of file
diff --git a/tools/walk/Dockerfile.template b/tools/walk/Dockerfile.template
index fe48ab175..05b86cbc2 100644
--- a/tools/walk/Dockerfile.template
+++ b/tools/walk/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "antonmedv/walk" "v${version}" "walk_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/walk" \
+curl --silent --location --fail --output "${prefix}/bin/walk" \
     "https://github.com/antonmedv/walk/releases/download/v${version}/walk_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/walk"
+chmod +x "${prefix}/bin/walk"
 EOF
\ No newline at end of file
diff --git a/tools/warp/Dockerfile.template b/tools/warp/Dockerfile.template
index 34a8cf20a..daa901d61 100644
--- a/tools/warp/Dockerfile.template
+++ b/tools/warp/Dockerfile.template
@@ -23,11 +23,11 @@ check-github-release-asset "minio/warp" "v${version}" "warp_Linux_${arch_suffix}
 
 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}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     warp
 EOF
 
 FROM download AS prepare
-COPY <<EOF ${prefix}${target}/share/bash-completion/completions/warp
+COPY <<EOF ${prefix}/share/bash-completion/completions/warp
 complete -C warp warp
 EOF
\ No newline at end of file
diff --git a/tools/wasmedge/Dockerfile.template b/tools/wasmedge/Dockerfile.template
index 09e446c71..072297698 100644
--- a/tools/wasmedge/Dockerfile.template
+++ b/tools/wasmedge/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "WasmEdge/WasmEdge" "${version}" "WasmEdge-${version}-manylinux2014_${arch}.tar.xz"
 curl --silent --location --fail "https://github.com/WasmEdge/WasmEdge/releases/download/${version}/WasmEdge-${version}-manylinux2014_${arch}.tar.xz" \
-| tar --extract --xz --directory="${prefix}${target}" --strip-components=1 --no-same-owner
+| tar --extract --xz --directory="${prefix}" --strip-components=1 --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/wasmer/Dockerfile.template b/tools/wasmer/Dockerfile.template
index 0f6d804dc..177570a38 100644
--- a/tools/wasmer/Dockerfile.template
+++ b/tools/wasmer/Dockerfile.template
@@ -22,6 +22,6 @@ case "${alt_arch}" in
 esac
 check-github-release-asset "wasmerio/wasmer" "v${version}" "wasmer-linux-${arch_suffix}.tar.gz"
 curl --silent --location --fail "https://github.com/wasmerio/wasmer/releases/download/v${version}/wasmer-linux-${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}" --no-same-owner \
     bin
 EOF
\ No newline at end of file
diff --git a/tools/wasmi/Dockerfile.template b/tools/wasmi/Dockerfile.template
index 7193c1855..62c65ac36 100644
--- a/tools/wasmi/Dockerfile.template
+++ b/tools/wasmi/Dockerfile.template
@@ -18,9 +18,9 @@ WORKDIR /tmp/github.com/paritytech/wasmi
 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/paritytech/wasmi .
 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}${target}/bin/"
+cp "target/${arch}-unknown-linux-gnu/release/wasmi_cli" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/wasmtime/Dockerfile.template b/tools/wasmtime/Dockerfile.template
index 639f2f778..eb41e51fe 100644
--- a/tools/wasmtime/Dockerfile.template
+++ b/tools/wasmtime/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "bytecodealliance/wasmtime" "v${version}" "wasmtime-v${version}-${arch}-linux.tar.xz"
 curl --silent --location --fail "https://github.com/bytecodealliance/wasmtime/releases/download/v${version}/wasmtime-v${version}-${arch}-linux.tar.xz" \
-| tar --extract --xz --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --xz --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     "wasmtime-v${version}-${arch}-linux/wasmtime"
 EOF
\ No newline at end of file
diff --git a/tools/watchexec/Dockerfile.template b/tools/watchexec/Dockerfile.template
index 606abdcd8..340860538 100644
--- a/tools/watchexec/Dockerfile.template
+++ b/tools/watchexec/Dockerfile.template
@@ -10,16 +10,16 @@ ARG version
 RUN <<EOF
 check-github-release-asset "watchexec/watchexec" "v${version}" "watchexec-${version}-${arch}-unknown-linux-musl.tar.xz"
 curl --silent --location --fail "https://github.com/watchexec/watchexec/releases/download/v${version}/watchexec-${version}-${arch}-unknown-linux-musl.tar.xz" \
-| tar --extract --xz --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --xz --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     "watchexec-${version}-${arch}-unknown-linux-musl/watchexec" \
     "watchexec-${version}-${arch}-unknown-linux-musl/watchexec.1"
 
-mv "${prefix}${target}/bin/watchexec.1" "${prefix}${target}/share/man/man1/"
+mv "${prefix}/bin/watchexec.1" "${prefix}/share/man/man1/"
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${prefix}${target}/share/bash-completion/completions/foo"
-#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
-#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo"
+#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo"
+#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish"
+#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo"
 #EOF
\ No newline at end of file
diff --git a/tools/watchtower/Dockerfile.template b/tools/watchtower/Dockerfile.template
index 5b27e5a47..b6a6b6b35 100644
--- a/tools/watchtower/Dockerfile.template
+++ b/tools/watchtower/Dockerfile.template
@@ -12,10 +12,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "containrrr/watchtower" "v${version}" "watchtower_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/containrrr/watchtower/releases/download/v${version}/watchtower_linux_amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     watchtower
 
-"${prefix}${target}/bin/watchtower" completion bash >"${prefix}${target}/share/bash-completion/completions/watchtower"
-"${prefix}${target}/bin/watchtower" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/watchtower.fish"
-"${prefix}${target}/bin/watchtower" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_watchtower"
+"${prefix}/bin/watchtower" completion bash >"${prefix}/share/bash-completion/completions/watchtower"
+"${prefix}/bin/watchtower" completion fish >"${prefix}/share/fish/vendor_completions.d/watchtower.fish"
+"${prefix}/bin/watchtower" completion zsh >"${prefix}/share/zsh/vendor-completions/_watchtower"
 EOF
\ No newline at end of file
diff --git a/tools/webhookd/Dockerfile.template b/tools/webhookd/Dockerfile.template
index 866a84360..caaad842b 100644
--- a/tools/webhookd/Dockerfile.template
+++ b/tools/webhookd/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ncarlier/webhookd" "v${version}" "webhookd-linux-${alt_arch}.tgz"
 curl --silent --location --fail "https://github.com/ncarlier/webhookd/releases/download/v${version}/webhookd-linux-${alt_arch}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     webhookd
 EOF
\ No newline at end of file
diff --git a/tools/websocat/Dockerfile.template b/tools/websocat/Dockerfile.template
index f97592fb1..b207b29b3 100644
--- a/tools/websocat/Dockerfile.template
+++ b/tools/websocat/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "vi/websocat" "v${version}" "websocat.x86_64-unknown-linux-musl"
-curl --silent --location --fail --output "${prefix}${target}/bin/websocat" \
+curl --silent --location --fail --output "${prefix}/bin/websocat" \
     "https://github.com/vi/websocat/releases/download/v${version}/websocat.x86_64-unknown-linux-musl"
-chmod +x "${prefix}${target}/bin/websocat"
+chmod +x "${prefix}/bin/websocat"
 EOF
\ No newline at end of file
diff --git a/tools/wg/Dockerfile.template b/tools/wg/Dockerfile.template
index c4b7ad8a8..21dd7c4bc 100644
--- a/tools/wg/Dockerfile.template
+++ b/tools/wg/Dockerfile.template
@@ -21,5 +21,5 @@ check-clone https://git.zx2c4.com/wireguard-tools "v${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://git.zx2c4.com/wireguard-tools .
 cd src
 make LDFLAGS=-static
-make install DESTDIR="${prefix}" PREFIX="${target}"
+make install DESTDIR="${prefix}" PREFIX=""
 EOF
\ No newline at end of file
diff --git a/tools/whalebrew/Dockerfile.template b/tools/whalebrew/Dockerfile.template
index 8b78d942f..84503f3bb 100644
--- a/tools/whalebrew/Dockerfile.template
+++ b/tools/whalebrew/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "whalebrew/whalebrew" "${version}" "whalebrew-Linux-x86_64"
-curl --silent --location --fail --output "${prefix}${target}/bin/whalebrew" \
+curl --silent --location --fail --output "${prefix}/bin/whalebrew" \
     "https://github.com/whalebrew/whalebrew/releases/download/${version}/whalebrew-Linux-x86_64"
-chmod +x "${prefix}${target}/bin/whalebrew"
+chmod +x "${prefix}/bin/whalebrew"
 
-"${prefix}${target}/bin/whalebrew" completion bash >"${prefix}${target}/share/bash-completion/completions/whalebrew"
-"${prefix}${target}/bin/whalebrew" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/whalebrew.fish"
-"${prefix}${target}/bin/whalebrew" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_whalebrew"
+"${prefix}/bin/whalebrew" completion bash >"${prefix}/share/bash-completion/completions/whalebrew"
+"${prefix}/bin/whalebrew" completion fish >"${prefix}/share/fish/vendor_completions.d/whalebrew.fish"
+"${prefix}/bin/whalebrew" completion zsh >"${prefix}/share/zsh/vendor-completions/_whalebrew"
 EOF
\ No newline at end of file
diff --git a/tools/whalesay/Dockerfile.template b/tools/whalesay/Dockerfile.template
index 37af9fc08..9aec9af89 100644
--- a/tools/whalesay/Dockerfile.template
+++ b/tools/whalesay/Dockerfile.template
@@ -7,8 +7,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY docker.cow ${prefix}${target}/share/cows/
-COPY --chmod=0755 <<EOF ${prefix}${target}/bin/whalesay
+COPY docker.cow ${prefix}/share/cows/
+COPY --chmod=0755 <<EOF ${prefix}/bin/whalesay
 #!/bin/bash
 exec cowsay -f docker "\$@"
 EOF
\ No newline at end of file
diff --git a/tools/win-gpg-agent/Dockerfile.template b/tools/win-gpg-agent/Dockerfile.template
index 39f430c04..ed75908de 100644
--- a/tools/win-gpg-agent/Dockerfile.template
+++ b/tools/win-gpg-agent/Dockerfile.template
@@ -14,5 +14,5 @@ check-github-release-asset "rupor-github/win-gpg-agent" "v${version}" "win-gpg-a
 curl --silent --location --fail --remote-name "https://github.com/rupor-github/win-gpg-agent/releases/download/v${version}/win-gpg-agent.zip"
 unzip -q -o -d "/tmp" "win-gpg-agent.zip"
 rm "win-gpg-agent.zip"
-mv "/tmp/sorelay.exe" "${prefix}${target}/bin"
+mv "/tmp/sorelay.exe" "${prefix}/bin"
 EOF
\ No newline at end of file
diff --git a/tools/wireguard-go/Dockerfile.template b/tools/wireguard-go/Dockerfile.template
index ac83c7edd..6d9455336 100644
--- a/tools/wireguard-go/Dockerfile.template
+++ b/tools/wireguard-go/Dockerfile.template
@@ -17,5 +17,5 @@ RUN <<EOF
 check-clone https://git.zx2c4.com/wireguard-go "${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://git.zx2c4.com/wireguard-go .
 make
-mv wireguard-go "${prefix}${target}/bin/"
+mv wireguard-go "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/witness/Dockerfile.template b/tools/witness/Dockerfile.template
index 6e9666a43..5bd54717f 100644
--- a/tools/witness/Dockerfile.template
+++ b/tools/witness/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "testifysec/witness" "v${version}" "witness_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/testifysec/witness/releases/download/v${version}/witness_${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 \
     witness
 
-"${prefix}${target}/bin/witness" completion bash >"${prefix}${target}/share/bash-completion/completions/witness"
-"${prefix}${target}/bin/witness" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/witness.fish"
-"${prefix}${target}/bin/witness" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_witness"
+"${prefix}/bin/witness" completion bash >"${prefix}/share/bash-completion/completions/witness"
+"${prefix}/bin/witness" completion fish >"${prefix}/share/fish/vendor_completions.d/witness.fish"
+"${prefix}/bin/witness" completion zsh >"${prefix}/share/zsh/vendor-completions/_witness"
 EOF
\ No newline at end of file
diff --git a/tools/wksctl/Dockerfile.template b/tools/wksctl/Dockerfile.template
index 9db13d609..e57fc2869 100644
--- a/tools/wksctl/Dockerfile.template
+++ b/tools/wksctl/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "weaveworks/wksctl" "v${version}" "wksctl-${version}-linux-x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/weaveworks/wksctl/releases/download/v${version}/wksctl-${version}-linux-x86_64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/share/" --no-same-owner
-mv "${prefix}${target}/share/wksctl" "${prefix}${target}/bin/"
-mv "${prefix}${target}/share/examples" "${prefix}${target}/share/wksctl/"
-"${prefix}${target}/bin/wksctl" bash-completions >"${prefix}${target}/share/bash-completion/completions/wksctl"
-"${prefix}${target}/bin/wksctl" zsh-completions >"${prefix}${target}/share/zsh/vendor-completions/_wksctl"
+| tar --extract --gzip --directory="${prefix}/share/" --no-same-owner
+mv "${prefix}/share/wksctl" "${prefix}/bin/"
+mv "${prefix}/share/examples" "${prefix}/share/wksctl/"
+"${prefix}/bin/wksctl" bash-completions >"${prefix}/share/bash-completion/completions/wksctl"
+"${prefix}/bin/wksctl" zsh-completions >"${prefix}/share/zsh/vendor-completions/_wksctl"
 EOF
\ No newline at end of file
diff --git a/tools/woke/Dockerfile.template b/tools/woke/Dockerfile.template
index 14834251b..eeaf8a84c 100644
--- a/tools/woke/Dockerfile.template
+++ b/tools/woke/Dockerfile.template
@@ -10,13 +10,13 @@ ARG version
 RUN <<EOF
 check-github-release-asset "get-woke/woke" "v${version}" "woke-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/get-woke/woke/releases/download/v${version}/woke-${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 \
     "woke-${version}-linux-${alt_arch}/woke"
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${prefix}${target}/share/bash-completion/completions/foo"
-#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
-#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo"
+#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo"
+#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish"
+#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo"
 #EOF
\ No newline at end of file
diff --git a/tools/woodpecker/Dockerfile.template b/tools/woodpecker/Dockerfile.template
index b92cd7b1c..e5ada8aa2 100644
--- a/tools/woodpecker/Dockerfile.template
+++ b/tools/woodpecker/Dockerfile.template
@@ -13,13 +13,13 @@ ARG version
 RUN <<EOF
 check-github-release-asset "woodpecker-ci/woodpecker" "v${version}" "woodpecker-server_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/woodpecker-ci/woodpecker/releases/download/v${version}/woodpecker-server_linux_amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 
 check-github-release-asset "woodpecker-ci/woodpecker" "v${version}" "woodpecker-agent_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/woodpecker-ci/woodpecker/releases/download/v${version}/woodpecker-agent_linux_amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 
 check-github-release-asset "woodpecker-ci/woodpecker" "v${version}" "woodpecker-cli_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/woodpecker-ci/woodpecker/releases/download/v${version}/woodpecker-cli_linux_amd64.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/wordcloud/Dockerfile.template b/tools/wordcloud/Dockerfile.template
index 8ae65ad22..b9a2ea3c7 100644
--- a/tools/wordcloud/Dockerfile.template
+++ b/tools/wordcloud/Dockerfile.template
@@ -20,13 +20,13 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/wordcloud_cli" --console-script wordcloud_cli "wordcloud==${version}"
+shiv --output-file "${prefix}/bin/wordcloud_cli" --console-script wordcloud_cli "wordcloud==${version}"
 EOF
 
 # Alternative
 #RUN <<EOF
-#python -m venv "${prefix}${target}/usr/libexec/${name}"
-#source "${prefix}${target}/libexec/${name}/bin/activate"
+#python -m venv "${prefix}/usr/libexec/${name}"
+#source "${prefix}/libexec/${name}/bin/activate"
 #pip install "wordcloud==${version}"
 #deactivate
 #EOF
diff --git a/tools/wsl-open/Dockerfile.template b/tools/wsl-open/Dockerfile.template
index d3f38c2d4..f8d54ed6d 100644
--- a/tools/wsl-open/Dockerfile.template
+++ b/tools/wsl-open/Dockerfile.template
@@ -11,11 +11,11 @@ ARG version
 
 RUN <<EOF
 check-download "https://github.com/4U6U57/wsl-open/raw/v${version}/wsl-open.sh"
-curl --silent --location --fail --output "${prefix}${target}/bin/wsl-open" \
+curl --silent --location --fail --output "${prefix}/bin/wsl-open" \
     "https://github.com/4U6U57/wsl-open/raw/v${version}/wsl-open.sh"
-chmod +x "${prefix}${target}/bin/wsl-open"
+chmod +x "${prefix}/bin/wsl-open"
 
 check-download "https://github.com/4U6U57/wsl-open/raw/v${version}/wsl-open.1"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/wsl-open.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/wsl-open.1" \
     "https://github.com/4U6U57/wsl-open/raw/v${version}/wsl-open.1"
 EOF
\ No newline at end of file
diff --git a/tools/wslu/Dockerfile.template b/tools/wslu/Dockerfile.template
index b8c8a111c..49938cf90 100644
--- a/tools/wslu/Dockerfile.template
+++ b/tools/wslu/Dockerfile.template
@@ -14,5 +14,5 @@ ARG version
 RUN <<EOF
 curl --silent --location --fail "https://github.com/wslutilities/wslu/archive/refs/tags/v${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1
-make all install "DESTDIR=${prefix}" "PREFIX=${target}"
+make all install "DESTDIR=${prefix}" "PREFIX="
 EOF
\ No newline at end of file

From 89c3f161484ebdba19e5bc5185504fe22711a76c Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 15:25:52 +0100
Subject: [PATCH 3/3] Fixed builds #2213

---
 tools/warp/Dockerfile.template  | 11 +++++++----
 tools/wasmi/Dockerfile.template |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

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/"