From 5cf8d02db12d185daf6b5d723cb0eca2e65dde66 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 21 Dec 2023 11:51:59 +0100
Subject: [PATCH 1/4] Remove target for c* #2213

---
 tools/cadvisor/Dockerfile.template          |  8 +++++---
 tools/calicoctl/Dockerfile.template         |  9 +++++----
 tools/car/Dockerfile.template               |  8 +++++---
 tools/cas/Dockerfile.template               |  9 +++++----
 tools/cascadia-code/Dockerfile.template     |  9 +++++----
 tools/catatonit/Dockerfile.template         |  9 +++++----
 tools/cdebug/Dockerfile.template            |  8 +++++---
 tools/cdncheck/Dockerfile.template          |  8 +++++---
 tools/cdxgen/Dockerfile.template            | 12 +++++++-----
 tools/cfssl/Dockerfile.template             |  9 +++++----
 tools/chart-releaser/Dockerfile.template    |  8 +++++---
 tools/chart-testing/Dockerfile.template     |  8 +++++---
 tools/cheat/Dockerfile.template             |  9 +++++----
 tools/checkov/Dockerfile.template           | 12 +++++++-----
 tools/chekr/Dockerfile.template             |  9 +++++----
 tools/chigo/Dockerfile.template             |  9 +++++----
 tools/chisel/Dockerfile.template            |  9 +++++----
 tools/cilium/Dockerfile.template            |  8 +++++---
 tools/cinf/Dockerfile.template              |  7 +++++--
 tools/click/Dockerfile.template             |  8 +++++---
 tools/cloudflared/Dockerfile.template       |  7 +++++--
 tools/clusterawsadm/Dockerfile.template     |  7 +++++--
 tools/clusterctl/Dockerfile.template        |  8 +++++---
 tools/clusterlint/Dockerfile.template       |  8 +++++---
 tools/cmctl/Dockerfile.template             |  8 +++++---
 tools/cni/Dockerfile.template               |  8 +++++---
 tools/cnitool/Dockerfile.template           | 10 ++++++----
 tools/cntr/Dockerfile.template              |  8 +++++---
 tools/cockroach/Dockerfile.template         |  8 +++++---
 tools/code-server/Dockerfile.template       |  8 +++++---
 tools/coder/Dockerfile.template             |  8 +++++---
 tools/colima/Dockerfile.template            |  7 +++++--
 tools/composerize/Dockerfile.template       | 12 +++++++-----
 tools/concourse/Dockerfile.template         |  7 +++++--
 tools/conftest/Dockerfile.template          |  7 +++++--
 tools/conmon/Dockerfile.template            | 10 ++++++----
 tools/containerd/Dockerfile.template        | 10 ++++++----
 tools/containers-common/Dockerfile.template | 10 ++++++----
 tools/containerssh/Dockerfile.template      |  7 +++++--
 tools/copa/Dockerfile.template              |  8 +++++---
 tools/cosign/Dockerfile.template            | 10 ++++++----
 tools/cowsay/Dockerfile.template            |  7 +++++--
 tools/crane/Dockerfile.template             |  4 +---
 tools/cri-dockerd/Dockerfile.template       |  8 +++++---
 tools/cri-o/Dockerfile.template             | 12 +++++++-----
 tools/crictl/Dockerfile.template            |  8 +++++---
 tools/croc/Dockerfile.template              |  8 +++++---
 tools/crossplane/Dockerfile.template        |  8 +++++---
 tools/crun/Dockerfile.template              |  8 +++++---
 tools/ct/Dockerfile.template                | 12 +++++++-----
 tools/ct_server/Dockerfile.template         | 10 ++++++----
 tools/ctop/Dockerfile.template              |  7 +++++--
 tools/cue/Dockerfile.template               |  7 +++++--
 tools/curl/Dockerfile.template              |  8 +++++---
 tools/curlie/Dockerfile.template            |  8 +++++---
 tools/cve-bin-tool/Dockerfile.template      | 12 +++++++-----
 tools/cyclonedx-cli/Dockerfile.template     |  7 +++++--
 tools/cyclonedx-gomod/Dockerfile.template   |  8 +++++---
 tools/cypher-shell/Dockerfile.template      |  8 +++++---
 59 files changed, 309 insertions(+), 193 deletions(-)

diff --git a/tools/cadvisor/Dockerfile.template b/tools/cadvisor/Dockerfile.template
index 488050a430..bb7d11a5cd 100644
--- a/tools/cadvisor/Dockerfile.template
+++ b/tools/cadvisor/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/calicoctl/Dockerfile.template b/tools/calicoctl/Dockerfile.template
index b3ff0717e3..9ed3504ac8 100644
--- a/tools/calicoctl/Dockerfile.template
+++ b/tools/calicoctl/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "projectcalico/calico" "v${version}" "calicoctl-linux-${alt_arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/calicoctl" \
diff --git a/tools/car/Dockerfile.template b/tools/car/Dockerfile.template
index 015bf4a75d..2ab70009fb 100644
--- a/tools/car/Dockerfile.template
+++ b/tools/car/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/cas/Dockerfile.template b/tools/cas/Dockerfile.template
index 820698200d..bc117fecd4 100644
--- a/tools/cas/Dockerfile.template
+++ b/tools/cas/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "codenotary/cas" "v${version}" "cas-v${version}-linux-${alt_arch}-static"
 curl --silent --location --fail --output "${prefix}${target}/bin/cas" \
diff --git a/tools/cascadia-code/Dockerfile.template b/tools/cascadia-code/Dockerfile.template
index f80f0537ef..44e9379929 100644
--- a/tools/cascadia-code/Dockerfile.template
+++ b/tools/cascadia-code/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "microsoft/cascadia-code" "v${version}" "CascadiaCode-${version}.zip"
 url="https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"
diff --git a/tools/catatonit/Dockerfile.template b/tools/catatonit/Dockerfile.template
index 7d0dedc0d2..a2235201d1 100644
--- a/tools/catatonit/Dockerfile.template
+++ b/tools/catatonit/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "openSUSE/catatonit" "v${version}" "catatonit.${arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/catatonit" \
diff --git a/tools/cdebug/Dockerfile.template b/tools/cdebug/Dockerfile.template
index f4c0f15dc9..79ea782fcf 100644
--- a/tools/cdebug/Dockerfile.template
+++ b/tools/cdebug/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/cdncheck/Dockerfile.template b/tools/cdncheck/Dockerfile.template
index 05fd46e047..41b7736463 100644
--- a/tools/cdncheck/Dockerfile.template
+++ b/tools/cdncheck/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/cdxgen/Dockerfile.template b/tools/cdxgen/Dockerfile.template
index dd3d8126f4..1497ad6b46 100644
--- a/tools/cdxgen/Dockerfile.template
+++ b/tools/cdxgen/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/nodejs:latest AS nodejs
+FROM ghcr.io/uniget-org/tools/npm:latest AS npm
 
-FROM ghcr.io/uniget-org/tools/nodejs:${ref} AS nodejs
-FROM ghcr.io/uniget-org/tools/npm:${ref} AS npm
-
-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 --link --from=nodejs / /
diff --git a/tools/cfssl/Dockerfile.template b/tools/cfssl/Dockerfile.template
index f658aa0533..c8947169bb 100644
--- a/tools/cfssl/Dockerfile.template
+++ b/tools/cfssl/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
-
 ARG BINARIES="cfssl-bundle cfssl-certinfo cfssl-newkey cfssl-scan cfssljson cfssl mkbundle multirootca"
 RUN <<EOF
 for BINARY in ${BINARIES}; do
diff --git a/tools/chart-releaser/Dockerfile.template b/tools/chart-releaser/Dockerfile.template
index a1ac97cec9..3f3cbc780b 100644
--- a/tools/chart-releaser/Dockerfile.template
+++ b/tools/chart-releaser/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/chart-testing/Dockerfile.template b/tools/chart-testing/Dockerfile.template
index 004938697c..daca46714c 100644
--- a/tools/chart-testing/Dockerfile.template
+++ b/tools/chart-testing/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/cheat/Dockerfile.template b/tools/cheat/Dockerfile.template
index c507660f4e..040c816e34 100644
--- a/tools/cheat/Dockerfile.template
+++ b/tools/cheat/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "cheat/cheat" "${version}" "cheat-linux-${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/cheat/cheat/releases/download/${version}/cheat-linux-${alt_arch}.gz" \
diff --git a/tools/checkov/Dockerfile.template b/tools/checkov/Dockerfile.template
index 6cf17c12b8..d0be96b1d7 100644
--- a/tools/checkov/Dockerfile.template
+++ b/tools/checkov/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/chekr/Dockerfile.template b/tools/chekr/Dockerfile.template
index 1ed048bf0b..fc59fcaccc 100644
--- a/tools/chekr/Dockerfile.template
+++ b/tools/chekr/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "ckotzbauer/chekr" "${version}" "chekr_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ckotzbauer/chekr/releases/download/${version}/chekr_${version}_linux_${alt_arch}.tar.gz" \
diff --git a/tools/chigo/Dockerfile.template b/tools/chigo/Dockerfile.template
index 4f0259d04a..fe08789e74 100644
--- a/tools/chigo/Dockerfile.template
+++ b/tools/chigo/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "UltiRequiem/chigo" "v${version}" "chigo_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/UltiRequiem/chigo/releases/download/v${version}/chigo_${version}_linux_${alt_arch}.tar.gz" \
diff --git a/tools/chisel/Dockerfile.template b/tools/chisel/Dockerfile.template
index 5d2c24728b..a5a35b4d0a 100644
--- a/tools/chisel/Dockerfile.template
+++ b/tools/chisel/Dockerfile.template
@@ -1,11 +1,12 @@
 #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
 check-github-release-asset "jpillora/chisel" "v${version}" "chisel_${version}_linux_${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/jpillora/chisel/releases/download/v${version}/chisel_${version}_linux_${alt_arch}.gz" \
diff --git a/tools/cilium/Dockerfile.template b/tools/cilium/Dockerfile.template
index 02097f8cff..7b47e2ba43 100644
--- a/tools/cilium/Dockerfile.template
+++ b/tools/cilium/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/cinf/Dockerfile.template b/tools/cinf/Dockerfile.template
index 34c03e1cde..8fb9c07d3e 100644
--- a/tools/cinf/Dockerfile.template
+++ b/tools/cinf/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/click/Dockerfile.template b/tools/click/Dockerfile.template
index e9d1f7baed..6a6ac123bd 100644
--- a/tools/click/Dockerfile.template
+++ b/tools/click/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/cloudflared/Dockerfile.template b/tools/cloudflared/Dockerfile.template
index cd7467774a..e8e2df0ae5 100644
--- a/tools/cloudflared/Dockerfile.template
+++ b/tools/cloudflared/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/clusterawsadm/Dockerfile.template b/tools/clusterawsadm/Dockerfile.template
index 5a5a218f0f..29a7103ef4 100644
--- a/tools/clusterawsadm/Dockerfile.template
+++ b/tools/clusterawsadm/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/clusterctl/Dockerfile.template b/tools/clusterctl/Dockerfile.template
index 7034f767b2..0c8123a822 100644
--- a/tools/clusterctl/Dockerfile.template
+++ b/tools/clusterctl/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/clusterlint/Dockerfile.template b/tools/clusterlint/Dockerfile.template
index 4fe5c209fc..a8e7e22b8b 100644
--- a/tools/clusterlint/Dockerfile.template
+++ b/tools/clusterlint/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/cmctl/Dockerfile.template b/tools/cmctl/Dockerfile.template
index 5d04f0d8aa..988d70dea1 100644
--- a/tools/cmctl/Dockerfile.template
+++ b/tools/cmctl/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/cni/Dockerfile.template b/tools/cni/Dockerfile.template
index a8e3feb5a8..a5d2d33d45 100644
--- a/tools/cni/Dockerfile.template
+++ b/tools/cni/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/cnitool/Dockerfile.template b/tools/cnitool/Dockerfile.template
index 648e30b108..80bc3c5047 100644
--- a/tools/cnitool/Dockerfile.template
+++ b/tools/cnitool/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/go:${ref} AS go
-
-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 / /
 WORKDIR /go/src/github.com/containernetworking/cni
 ARG name
diff --git a/tools/cntr/Dockerfile.template b/tools/cntr/Dockerfile.template
index 9b426950aa..0b5ebe7563 100644
--- a/tools/cntr/Dockerfile.template
+++ b/tools/cntr/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/cockroach/Dockerfile.template b/tools/cockroach/Dockerfile.template
index d68aa514b0..be577c0f61 100644
--- a/tools/cockroach/Dockerfile.template
+++ b/tools/cockroach/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/code-server/Dockerfile.template b/tools/code-server/Dockerfile.template
index e997293896..052294fb7a 100644
--- a/tools/code-server/Dockerfile.template
+++ b/tools/code-server/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/coder/Dockerfile.template b/tools/coder/Dockerfile.template
index 85f1b27ab9..507088d21d 100644
--- a/tools/coder/Dockerfile.template
+++ b/tools/coder/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/colima/Dockerfile.template b/tools/colima/Dockerfile.template
index 37b1bbafd3..b2ddc16a0d 100644
--- a/tools/colima/Dockerfile.template
+++ b/tools/colima/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/composerize/Dockerfile.template b/tools/composerize/Dockerfile.template
index c773505726..6d15ea983d 100644
--- a/tools/composerize/Dockerfile.template
+++ b/tools/composerize/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/nodejs:latest AS nodejs
+FROM ghcr.io/uniget-org/tools/npm:latest AS npm
 
-FROM ghcr.io/uniget-org/tools/nodejs:${ref} AS nodejs
-FROM ghcr.io/uniget-org/tools/npm:${ref} AS npm
-
-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 --link --from=nodejs / /
diff --git a/tools/concourse/Dockerfile.template b/tools/concourse/Dockerfile.template
index e5e8bcc4c6..3cc2c67f64 100644
--- a/tools/concourse/Dockerfile.template
+++ b/tools/concourse/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/conftest/Dockerfile.template b/tools/conftest/Dockerfile.template
index 0c7400f2aa..420d770738 100644
--- a/tools/conftest/Dockerfile.template
+++ b/tools/conftest/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/conmon/Dockerfile.template b/tools/conmon/Dockerfile.template
index ee7a8b9072..ffaed193b1 100644
--- a/tools/conmon/Dockerfile.template
+++ b/tools/conmon/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go-md2man:latest AS go-md2man
 
-FROM ghcr.io/uniget-org/tools/go-md2man:${ref} AS go-md2man
-
-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/containerd/Dockerfile.template b/tools/containerd/Dockerfile.template
index a905203f84..172145a8ae 100644
--- a/tools/containerd/Dockerfile.template
+++ b/tools/containerd/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go-md2man:latest AS go-md2man
 
-FROM ghcr.io/uniget-org/tools/go-md2man:${ref} AS go-md2man
-
-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-md2man / /
 ARG name
 ARG version
diff --git a/tools/containers-common/Dockerfile.template b/tools/containers-common/Dockerfile.template
index bfef1a6335..9157ecc794 100644
--- a/tools/containers-common/Dockerfile.template
+++ b/tools/containers-common/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go-md2man:latest AS go-md2man
 
-FROM ghcr.io/uniget-org/tools/go-md2man:${ref} AS go-md2man
-
-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-md2man / /
 ARG name
 ARG version
diff --git a/tools/containerssh/Dockerfile.template b/tools/containerssh/Dockerfile.template
index 406b2c8113..38ca64bca6 100644
--- a/tools/containerssh/Dockerfile.template
+++ b/tools/containerssh/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/copa/Dockerfile.template b/tools/copa/Dockerfile.template
index 2cd81436bc..ab23ba7920 100644
--- a/tools/copa/Dockerfile.template
+++ b/tools/copa/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/cosign/Dockerfile.template b/tools/cosign/Dockerfile.template
index dec35c26b0..6e597f291f 100644
--- a/tools/cosign/Dockerfile.template
+++ b/tools/cosign/Dockerfile.template
@@ -1,8 +1,6 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS cosign-bootstrap
+FROM ghcr.io/uniget-org/tools/base:latest AS cosign-bootstrap
 ARG TARGETPLATFORM
 # renovate: datasource=github-releases depName=sigstore/cosign
 ARG COSIGN_VERSION=2.1.1
@@ -21,7 +19,11 @@ mv "cosign-linux-${alt_arch}" /usr/local/bin/cosign
 cosign version
 EOF
 
-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=cosign-bootstrap /usr/local/bin/cosign /usr/local/bin/
 ARG name
 ARG version
diff --git a/tools/cowsay/Dockerfile.template b/tools/cowsay/Dockerfile.template
index 8eb930bcd8..80834111c8 100644
--- a/tools/cowsay/Dockerfile.template
+++ b/tools/cowsay/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/crane/Dockerfile.template b/tools/crane/Dockerfile.template
index 48980059bf..c51050fe5a 100644
--- a/tools/crane/Dockerfile.template
+++ b/tools/crane/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/cri-dockerd/Dockerfile.template b/tools/cri-dockerd/Dockerfile.template
index f4fc7c434d..d7ca7ec64f 100644
--- a/tools/cri-dockerd/Dockerfile.template
+++ b/tools/cri-dockerd/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/cri-o/Dockerfile.template b/tools/cri-o/Dockerfile.template
index 61c64bd5c1..98aa8c469b 100644
--- a/tools/cri-o/Dockerfile.template
+++ b/tools/cri-o/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/cosign:latest AS cosign
+FROM ghcr.io/uniget-org/tools/go-md2man:latest AS go-md2man
 
-FROM ghcr.io/uniget-org/tools/cosign:${ref} AS cosign
-FROM ghcr.io/uniget-org/tools/go-md2man:${ref} AS go-md2man
-
-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=cosign / /
 COPY --from=go-md2man / /
 ARG name
diff --git a/tools/crictl/Dockerfile.template b/tools/crictl/Dockerfile.template
index 4908e769ea..5486c3a928 100644
--- a/tools/crictl/Dockerfile.template
+++ b/tools/crictl/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/croc/Dockerfile.template b/tools/croc/Dockerfile.template
index 1a89da86ea..f06bd8e99b 100644
--- a/tools/croc/Dockerfile.template
+++ b/tools/croc/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/crossplane/Dockerfile.template b/tools/crossplane/Dockerfile.template
index 286b5267ae..76d48b71a6 100644
--- a/tools/crossplane/Dockerfile.template
+++ b/tools/crossplane/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/crun/Dockerfile.template b/tools/crun/Dockerfile.template
index e4b743f171..f6581137ae 100644
--- a/tools/crun/Dockerfile.template
+++ b/tools/crun/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM nixos/nix:2.19.2@sha256:935cdafedba76f86c45d01f30f243474c958e1099029b292e5f2fbeac5f8805e AS build
 ARG name
 ARG version
@@ -14,6 +12,10 @@ cp -rfp ./result/bin/crun /usr/local/bin/
 cp *.1 /usr/local/share/man/man1/
 EOF
 
-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=build /usr/local/bin/ ${prefix}${target}/bin/
 COPY --link --from=build /usr/local/share/man/man1/ ${prefix}${target}/share/man/man1/
\ No newline at end of file
diff --git a/tools/ct/Dockerfile.template b/tools/ct/Dockerfile.template
index 1b04c0ba36..09dd4a79f1 100644
--- a/tools/ct/Dockerfile.template
+++ b/tools/ct/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/github.com/flatcar/container-linux-config-transpiler
diff --git a/tools/ct_server/Dockerfile.template b/tools/ct_server/Dockerfile.template
index 45473f8b56..35c12d19bb 100644
--- a/tools/ct_server/Dockerfile.template
+++ b/tools/ct_server/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/go:${ref} AS go
-
-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 / /
 ARG name
 ARG version
diff --git a/tools/ctop/Dockerfile.template b/tools/ctop/Dockerfile.template
index 4bc1d3017e..ccfdeef8e6 100644
--- a/tools/ctop/Dockerfile.template
+++ b/tools/ctop/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/cue/Dockerfile.template b/tools/cue/Dockerfile.template
index da3efd2f23..282e9686d8 100644
--- a/tools/cue/Dockerfile.template
+++ b/tools/cue/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/curl/Dockerfile.template b/tools/curl/Dockerfile.template
index a645f85e5d..ae6809a2d5 100644
--- a/tools/curl/Dockerfile.template
+++ b/tools/curl/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 AS build
 WORKDIR /tmp/curl
 ARG name
@@ -43,7 +41,11 @@ mkdir -p /usr/local/share/man/man1/
 cp docs/curl.1 /usr/local/share/man/man1/
 EOF
 
-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 --from=build /usr/local/ ${prefix}${target}/
\ No newline at end of file
diff --git a/tools/curlie/Dockerfile.template b/tools/curlie/Dockerfile.template
index 3edbbc5bd1..f97f9ad090 100644
--- a/tools/curlie/Dockerfile.template
+++ b/tools/curlie/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/cve-bin-tool/Dockerfile.template b/tools/cve-bin-tool/Dockerfile.template
index 0f90d02cf2..06f90bb9bd 100644
--- a/tools/cve-bin-tool/Dockerfile.template
+++ b/tools/cve-bin-tool/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/cyclonedx-cli/Dockerfile.template b/tools/cyclonedx-cli/Dockerfile.template
index ca9e3f6533..763a94058c 100644
--- a/tools/cyclonedx-cli/Dockerfile.template
+++ b/tools/cyclonedx-cli/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/cyclonedx-gomod/Dockerfile.template b/tools/cyclonedx-gomod/Dockerfile.template
index 3b693fd604..1ea1120cc4 100644
--- a/tools/cyclonedx-gomod/Dockerfile.template
+++ b/tools/cyclonedx-gomod/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/cypher-shell/Dockerfile.template b/tools/cypher-shell/Dockerfile.template
index 796d14ed54..ce29bddf64 100644
--- a/tools/cypher-shell/Dockerfile.template
+++ b/tools/cypher-shell/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

From 77033e80d6a2d62ac926be72d8283b19c9b8458d Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 15:43:11 +0100
Subject: [PATCH 2/4] Removed target var #2213

---
 tools/cadvisor/Dockerfile.template          |  4 +-
 tools/calicoctl/Dockerfile.template         |  4 +-
 tools/car/Dockerfile.template               |  2 +-
 tools/cas/Dockerfile.template               | 10 ++--
 tools/cascadia-code/Dockerfile.template     |  8 +--
 tools/catatonit/Dockerfile.template         |  4 +-
 tools/cdebug/Dockerfile.template            |  8 +--
 tools/cdncheck/Dockerfile.template          |  8 +--
 tools/cdxgen/Dockerfile.template            |  4 +-
 tools/cfssl/Dockerfile.template             |  4 +-
 tools/chart-releaser/Dockerfile.template    |  8 +--
 tools/chart-testing/Dockerfile.template     | 14 +++---
 tools/cheat/Dockerfile.template             |  6 +--
 tools/checkov/Dockerfile.template           |  2 +-
 tools/chekr/Dockerfile.template             |  8 +--
 tools/chigo/Dockerfile.template             |  4 +-
 tools/chisel/Dockerfile.template            |  4 +-
 tools/cilium/Dockerfile.template            |  8 +--
 tools/cinf/Dockerfile.template              |  2 +-
 tools/click/Dockerfile.template             |  2 +-
 tools/cloudflared/Dockerfile.template       |  4 +-
 tools/clusterawsadm/Dockerfile.template     | 10 ++--
 tools/clusterctl/Dockerfile.template        |  8 +--
 tools/clusterlint/Dockerfile.template       |  2 +-
 tools/cmctl/Dockerfile.template             | 10 ++--
 tools/cni/Dockerfile.template               |  8 +--
 tools/cnitool/Dockerfile.template           |  2 +-
 tools/cntr/Dockerfile.template              |  4 +-
 tools/cockroach/Dockerfile.template         | 10 ++--
 tools/code-server/Dockerfile.template       |  2 +-
 tools/coder/Dockerfile.template             |  2 +-
 tools/colima/Dockerfile.template            | 10 ++--
 tools/composerize/Dockerfile.template       |  4 +-
 tools/concourse/Dockerfile.template         |  8 +--
 tools/conftest/Dockerfile.template          |  8 +--
 tools/conmon/Dockerfile.template            | 16 +++---
 tools/containerd/Dockerfile.template        | 28 +++++------
 tools/containers-common/Dockerfile.template | 24 ++++-----
 tools/containerssh/Dockerfile.template      |  2 +-
 tools/copa/Dockerfile.template              |  8 +--
 tools/cosign/Dockerfile.template            | 16 +++---
 tools/cowsay/Dockerfile.template            |  6 +--
 tools/crane/Dockerfile.template             |  8 +--
 tools/cri-dockerd/Dockerfile.template       |  6 +--
 tools/cri-o/Dockerfile.template             | 56 ++++++++++-----------
 tools/crictl/Dockerfile.template            |  2 +-
 tools/croc/Dockerfile.template              |  6 +--
 tools/crossplane/Dockerfile.template        |  4 +-
 tools/crun/Dockerfile.template              |  4 +-
 tools/ct/Dockerfile.template                |  2 +-
 tools/ct_server/Dockerfile.template         |  4 +-
 tools/ctop/Dockerfile.template              |  4 +-
 tools/cue/Dockerfile.template               |  8 +--
 tools/curl/Dockerfile.template              |  2 +-
 tools/curlie/Dockerfile.template            |  2 +-
 tools/cve-bin-tool/Dockerfile.template      |  2 +-
 tools/cyclonedx-cli/Dockerfile.template     |  4 +-
 tools/cyclonedx-gomod/Dockerfile.template   |  2 +-
 tools/cypher-shell/Dockerfile.template      |  8 +--
 59 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/tools/cadvisor/Dockerfile.template b/tools/cadvisor/Dockerfile.template
index bb7d11a5cd..2cee780ad8 100644
--- a/tools/cadvisor/Dockerfile.template
+++ b/tools/cadvisor/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "google/cadvisor" "v${version}" "cadvisor-v${version}-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/cadvisor" \
+curl --silent --location --fail --output "${prefix}/bin/cadvisor" \
     "https://github.com/google/cadvisor/releases/download/v${version}/cadvisor-v${version}-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/cadvisor"
+chmod +x "${prefix}/bin/cadvisor"
 EOF
\ No newline at end of file
diff --git a/tools/calicoctl/Dockerfile.template b/tools/calicoctl/Dockerfile.template
index 9ed3504ac8..b663c67b43 100644
--- a/tools/calicoctl/Dockerfile.template
+++ b/tools/calicoctl/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "projectcalico/calico" "v${version}" "calicoctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/calicoctl" \
+curl --silent --location --fail --output "${prefix}/bin/calicoctl" \
     "https://github.com/projectcalico/calico/releases/download/v${version}/calicoctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/calicoctl"
+chmod +x "${prefix}/bin/calicoctl"
 EOF
\ No newline at end of file
diff --git a/tools/car/Dockerfile.template b/tools/car/Dockerfile.template
index 2ab70009fb..170374740a 100644
--- a/tools/car/Dockerfile.template
+++ b/tools/car/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "tetratelabs/car" "v${version}" "car_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/tetratelabs/car/releases/download/v${version}/car_${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
 EOF
\ No newline at end of file
diff --git a/tools/cas/Dockerfile.template b/tools/cas/Dockerfile.template
index bc117fecd4..6701d1ae53 100644
--- a/tools/cas/Dockerfile.template
+++ b/tools/cas/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "codenotary/cas" "v${version}" "cas-v${version}-linux-${alt_arch}-static"
-curl --silent --location --fail --output "${prefix}${target}/bin/cas" \
+curl --silent --location --fail --output "${prefix}/bin/cas" \
     "https://github.com/codenotary/cas/releases/download/v${version}/cas-v${version}-linux-${alt_arch}-static"
-chmod +x "${prefix}${target}/bin/cas"
-"${prefix}${target}/bin/cas" completion bash >"${prefix}${target}/share/bash-completion/completions/cas"
-"${prefix}${target}/bin/cas" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cas.fish"
-"${prefix}${target}/bin/cas" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cas"
+chmod +x "${prefix}/bin/cas"
+"${prefix}/bin/cas" completion bash >"${prefix}/share/bash-completion/completions/cas"
+"${prefix}/bin/cas" completion fish >"${prefix}/share/fish/vendor_completions.d/cas.fish"
+"${prefix}/bin/cas" completion zsh >"${prefix}/share/zsh/vendor-completions/_cas"
 EOF
\ No newline at end of file
diff --git a/tools/cascadia-code/Dockerfile.template b/tools/cascadia-code/Dockerfile.template
index 44e9379929..fcce85f31b 100644
--- a/tools/cascadia-code/Dockerfile.template
+++ b/tools/cascadia-code/Dockerfile.template
@@ -13,8 +13,8 @@ url="https://github.com/microsoft/cascadia-code/releases/download/v${version}/Ca
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
 mkdir -p \
-    "${prefix}${target}/share/cascadia-code" \
-    "${prefix}${target}/share/fonts/cascadia-code"
-unzip -q -o -d "${prefix}${target}/share/cascadia-code/" "${filename}"
-find "${prefix}${target}/share/cascadia-code/ttf" -maxdepth 1 -type f -exec cp {} "${prefix}${target}/share/fonts/cascadia-code" \;
+    "${prefix}/share/cascadia-code" \
+    "${prefix}/share/fonts/cascadia-code"
+unzip -q -o -d "${prefix}/share/cascadia-code/" "${filename}"
+find "${prefix}/share/cascadia-code/ttf" -maxdepth 1 -type f -exec cp {} "${prefix}/share/fonts/cascadia-code" \;
 EOF
\ No newline at end of file
diff --git a/tools/catatonit/Dockerfile.template b/tools/catatonit/Dockerfile.template
index a2235201d1..dc5bb7b290 100644
--- a/tools/catatonit/Dockerfile.template
+++ b/tools/catatonit/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "openSUSE/catatonit" "v${version}" "catatonit.${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/catatonit" \
+curl --silent --location --fail --output "${prefix}/bin/catatonit" \
     "https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.${arch}"
-chmod +x "${prefix}${target}/bin/catatonit"
+chmod +x "${prefix}/bin/catatonit"
 EOF
\ No newline at end of file
diff --git a/tools/cdebug/Dockerfile.template b/tools/cdebug/Dockerfile.template
index 79ea782fcf..abaa236705 100644
--- a/tools/cdebug/Dockerfile.template
+++ b/tools/cdebug/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "iximiuz/cdebug" "v${version}" "cdebug_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/iximiuz/cdebug/releases/download/v${version}/cdebug_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     cdebug
 
-"${prefix}${target}/bin/cdebug" completion bash >"${prefix}${target}/share/bash-completion/completions/cdebug"
-"${prefix}${target}/bin/cdebug" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cdebug.fish"
-"${prefix}${target}/bin/cdebug" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cdebug"
+"${prefix}/bin/cdebug" completion bash >"${prefix}/share/bash-completion/completions/cdebug"
+"${prefix}/bin/cdebug" completion fish >"${prefix}/share/fish/vendor_completions.d/cdebug.fish"
+"${prefix}/bin/cdebug" completion zsh >"${prefix}/share/zsh/vendor-completions/_cdebug"
 EOF
diff --git a/tools/cdncheck/Dockerfile.template b/tools/cdncheck/Dockerfile.template
index 41b7736463..eadc8ba0c6 100644
--- a/tools/cdncheck/Dockerfile.template
+++ b/tools/cdncheck/Dockerfile.template
@@ -13,13 +13,13 @@ check-github-release-asset "projectdiscovery/cdncheck" "v${version}" "cdncheck_$
 url="https://github.com/projectdiscovery/cdncheck/releases/download/v${version}/cdncheck_${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}" \
     cdncheck
 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/cdxgen/Dockerfile.template b/tools/cdxgen/Dockerfile.template
index 1497ad6b46..f3e4011970 100644
--- a/tools/cdxgen/Dockerfile.template
+++ b/tools/cdxgen/Dockerfile.template
@@ -12,12 +12,12 @@ ARG name
 ARG version
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
-WORKDIR ${prefix}${target}/libexec/cdxgen
+WORKDIR ${prefix}/libexec/cdxgen
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "@cyclonedx/cdxgen@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/cdxgen/node_modules/.bin/cdxgen" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/cdxgen/node_modules/.bin/cdxgen" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/cfssl/Dockerfile.template b/tools/cfssl/Dockerfile.template
index c8947169bb..f850aa5bbb 100644
--- a/tools/cfssl/Dockerfile.template
+++ b/tools/cfssl/Dockerfile.template
@@ -11,8 +11,8 @@ ARG BINARIES="cfssl-bundle cfssl-certinfo cfssl-newkey cfssl-scan cfssljson cfss
 RUN <<EOF
 for BINARY in ${BINARIES}; do
     check-github-release-asset "cloudflare/cfssl" "v${version}" "${BINARY}_${version}_linux_amd64"
-    curl --silent --location --fail --output "${prefix}${target}/bin/${BINARY}" \
+    curl --silent --location --fail --output "${prefix}/bin/${BINARY}" \
         "https://github.com/cloudflare/cfssl/releases/download/v${version}/${BINARY}_${version}_linux_amd64"
-    chmod +x "${prefix}${target}/bin/${BINARY}"
+    chmod +x "${prefix}/bin/${BINARY}"
 done
 EOF
\ No newline at end of file
diff --git a/tools/chart-releaser/Dockerfile.template b/tools/chart-releaser/Dockerfile.template
index 3f3cbc780b..2eaca15f7d 100644
--- a/tools/chart-releaser/Dockerfile.template
+++ b/tools/chart-releaser/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "helm/chart-releaser" "v${version}" "chart-releaser_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/helm/chart-releaser/releases/download/v${version}/chart-releaser_${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 \
     cr
 
-"${prefix}${target}/bin/cr" completion bash >"${prefix}${target}/share/bash-completion/completions/cr"
-"${prefix}${target}/bin/cr" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cr.fish"
-"${prefix}${target}/bin/cr" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cr"
+"${prefix}/bin/cr" completion bash >"${prefix}/share/bash-completion/completions/cr"
+"${prefix}/bin/cr" completion fish >"${prefix}/share/fish/vendor_completions.d/cr.fish"
+"${prefix}/bin/cr" completion zsh >"${prefix}/share/zsh/vendor-completions/_cr"
 EOF
diff --git a/tools/chart-testing/Dockerfile.template b/tools/chart-testing/Dockerfile.template
index daca46714c..fdca40ecde 100644
--- a/tools/chart-testing/Dockerfile.template
+++ b/tools/chart-testing/Dockerfile.template
@@ -10,15 +10,15 @@ ARG version
 RUN <<EOF
 check-github-release-asset "helm/chart-testing" "v${version}" "chart-testing_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/helm/chart-testing/releases/download/v${version}/chart-testing_${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 \
     ct \
     etc
 mkdir -p "${prefix}/etc/ct"
-mv "${prefix}${target}/bin/etc/chart_schema.yaml" "${prefix}/etc/ct/"
-mv "${prefix}${target}/bin/etc/lintconf.yaml" "${prefix}/etc/ct/"
-rmdir "${prefix}${target}/bin/etc"
+mv "${prefix}/bin/etc/chart_schema.yaml" "${prefix}/etc/ct/"
+mv "${prefix}/bin/etc/lintconf.yaml" "${prefix}/etc/ct/"
+rmdir "${prefix}/bin/etc"
 
-"${prefix}${target}/bin/ct" completion bash >"${prefix}${target}/share/bash-completion/completions/ct"
-"${prefix}${target}/bin/ct" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/ct.fish"
-"${prefix}${target}/bin/ct" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_ct"
+"${prefix}/bin/ct" completion bash >"${prefix}/share/bash-completion/completions/ct"
+"${prefix}/bin/ct" completion fish >"${prefix}/share/fish/vendor_completions.d/ct.fish"
+"${prefix}/bin/ct" completion zsh >"${prefix}/share/zsh/vendor-completions/_ct"
 EOF
diff --git a/tools/cheat/Dockerfile.template b/tools/cheat/Dockerfile.template
index 040c816e34..bbf5dc8137 100644
--- a/tools/cheat/Dockerfile.template
+++ b/tools/cheat/Dockerfile.template
@@ -11,9 +11,9 @@ RUN <<EOF
 check-github-release-asset "cheat/cheat" "${version}" "cheat-linux-${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/cheat/cheat/releases/download/${version}/cheat-linux-${alt_arch}.gz" \
 | gunzip \
->"${prefix}${target}/bin/cheat"
-chmod +x "${prefix}${target}/bin/cheat"
+>"${prefix}/bin/cheat"
+chmod +x "${prefix}/bin/cheat"
 
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/cheat.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/cheat.1" \
     "https://github.com/cheat/cheat/raw/${version}/doc/cheat.1"
 EOF
\ No newline at end of file
diff --git a/tools/checkov/Dockerfile.template b/tools/checkov/Dockerfile.template
index d0be96b1d7..d4f5479da9 100644
--- a/tools/checkov/Dockerfile.template
+++ b/tools/checkov/Dockerfile.template
@@ -19,5 +19,5 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/checkov" --console-script checkov "checkov==${version}"
+shiv --output-file "${prefix}/bin/checkov" --console-script checkov "checkov==${version}"
 EOF
\ No newline at end of file
diff --git a/tools/chekr/Dockerfile.template b/tools/chekr/Dockerfile.template
index fc59fcaccc..d975c74a0d 100644
--- a/tools/chekr/Dockerfile.template
+++ b/tools/chekr/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ckotzbauer/chekr" "${version}" "chekr_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ckotzbauer/chekr/releases/download/${version}/chekr_${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 \
     chekr
-"${prefix}${target}/bin/chekr" completion bash >"${prefix}${target}/share/bash-completion/completions/chekr"
-"${prefix}${target}/bin/chekr" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/chekr.fish"
-"${prefix}${target}/bin/chekr" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_chekr"
+"${prefix}/bin/chekr" completion bash >"${prefix}/share/bash-completion/completions/chekr"
+"${prefix}/bin/chekr" completion fish >"${prefix}/share/fish/vendor_completions.d/chekr.fish"
+"${prefix}/bin/chekr" completion zsh >"${prefix}/share/zsh/vendor-completions/_chekr"
 EOF
\ No newline at end of file
diff --git a/tools/chigo/Dockerfile.template b/tools/chigo/Dockerfile.template
index fe08789e74..4ee3b0a0a1 100644
--- a/tools/chigo/Dockerfile.template
+++ b/tools/chigo/Dockerfile.template
@@ -10,7 +10,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "UltiRequiem/chigo" "v${version}" "chigo_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/UltiRequiem/chigo/releases/download/v${version}/chigo_${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 \
     chigo
-ln --symbolic --relative --force chigo "${prefix}${target}/bin/lolcat"
+ln --symbolic --relative --force chigo "${prefix}/bin/lolcat"
 EOF
\ No newline at end of file
diff --git a/tools/chisel/Dockerfile.template b/tools/chisel/Dockerfile.template
index a5a35b4d0a..90d1b1a2a9 100644
--- a/tools/chisel/Dockerfile.template
+++ b/tools/chisel/Dockerfile.template
@@ -11,6 +11,6 @@ RUN <<EOF
 check-github-release-asset "jpillora/chisel" "v${version}" "chisel_${version}_linux_${alt_arch}.gz"
 curl --silent --location --fail "https://github.com/jpillora/chisel/releases/download/v${version}/chisel_${version}_linux_${alt_arch}.gz" \
 | gunzip \
->"${prefix}${target}/bin/chisel"
-chmod +x "${prefix}${target}/bin/chisel"
+>"${prefix}/bin/chisel"
+chmod +x "${prefix}/bin/chisel"
 EOF
\ No newline at end of file
diff --git a/tools/cilium/Dockerfile.template b/tools/cilium/Dockerfile.template
index 7b47e2ba43..3cf3e311dd 100644
--- a/tools/cilium/Dockerfile.template
+++ b/tools/cilium/Dockerfile.template
@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cilium/cilium-cli" "v${version}" "cilium-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cilium/cilium-cli/releases/download/v${version}/cilium-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner
-"${prefix}${target}/bin/cilium" completion bash >"${prefix}${target}/share/bash-completion/completions/cilium"
-"${prefix}${target}/bin/cilium" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cilium.fish"
-"${prefix}${target}/bin/cilium" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cilium"
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner
+"${prefix}/bin/cilium" completion bash >"${prefix}/share/bash-completion/completions/cilium"
+"${prefix}/bin/cilium" completion fish >"${prefix}/share/fish/vendor_completions.d/cilium.fish"
+"${prefix}/bin/cilium" completion zsh >"${prefix}/share/zsh/vendor-completions/_cilium"
 EOF
\ No newline at end of file
diff --git a/tools/cinf/Dockerfile.template b/tools/cinf/Dockerfile.template
index 8fb9c07d3e..5fea0a344e 100644
--- a/tools/cinf/Dockerfile.template
+++ b/tools/cinf/Dockerfile.template
@@ -12,6 +12,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "mhausenblas/cinf" "v${version}" "cinf_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/mhausenblas/cinf/releases/download/v${version}/cinf_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     cinf
 EOF
\ No newline at end of file
diff --git a/tools/click/Dockerfile.template b/tools/click/Dockerfile.template
index 6a6ac123bd..37e40ac283 100644
--- a/tools/click/Dockerfile.template
+++ b/tools/click/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "databricks/click" "v${version}" "click-v${version}-x86_64-unknown-linux-musl.tar.gz"
 curl --silent --location --fail "https://github.com/databricks/click/releases/download/v${version}/click-v${version}-x86_64-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 \
     click-v${version}-x86_64-unknown-linux-musl/click
 EOF
\ No newline at end of file
diff --git a/tools/cloudflared/Dockerfile.template b/tools/cloudflared/Dockerfile.template
index e8e2df0ae5..83127b2a9a 100644
--- a/tools/cloudflared/Dockerfile.template
+++ b/tools/cloudflared/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "cloudflare/cloudflared" "${version}" "cloudflared-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/cloudflared" \
+curl --silent --location --fail --output "${prefix}/bin/cloudflared" \
     "https://github.com/cloudflare/cloudflared/releases/download/${version}/cloudflared-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/cloudflared"
+chmod +x "${prefix}/bin/cloudflared"
 EOF
\ No newline at end of file
diff --git a/tools/clusterawsadm/Dockerfile.template b/tools/clusterawsadm/Dockerfile.template
index 29a7103ef4..f4ec18d8a3 100644
--- a/tools/clusterawsadm/Dockerfile.template
+++ b/tools/clusterawsadm/Dockerfile.template
@@ -11,10 +11,10 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/cluster-api-provider-aws" "v${version}" "clusterawsadm-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/clusterawsadm" \
+curl --silent --location --fail --output "${prefix}/bin/clusterawsadm" \
     "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v${version}/clusterawsadm-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/clusterawsadm"
-"${prefix}${target}/bin/clusterawsadm" completion bash >"${prefix}${target}/share/bash-completion/completions/clusterawsadm"
-"${prefix}${target}/bin/clusterawsadm" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/clusterawsadm.fish"
-"${prefix}${target}/bin/clusterawsadm" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_clusterawsadm"
+chmod +x "${prefix}/bin/clusterawsadm"
+"${prefix}/bin/clusterawsadm" completion bash >"${prefix}/share/bash-completion/completions/clusterawsadm"
+"${prefix}/bin/clusterawsadm" completion fish >"${prefix}/share/fish/vendor_completions.d/clusterawsadm.fish"
+"${prefix}/bin/clusterawsadm" completion zsh >"${prefix}/share/zsh/vendor-completions/_clusterawsadm"
 EOF
\ No newline at end of file
diff --git a/tools/clusterctl/Dockerfile.template b/tools/clusterctl/Dockerfile.template
index 0c8123a822..b9a0d662d4 100644
--- a/tools/clusterctl/Dockerfile.template
+++ b/tools/clusterctl/Dockerfile.template
@@ -9,9 +9,9 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/cluster-api" "v${version}" "clusterctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/clusterctl" \
+curl --silent --location --fail --output "${prefix}/bin/clusterctl" \
     "https://github.com/kubernetes-sigs/cluster-api/releases/download/v${version}/clusterctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/clusterctl"
-"${prefix}${target}/bin/clusterctl" completion bash >"${prefix}${target}/share/bash-completion/completions/clusterctl"
-"${prefix}${target}/bin/clusterctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_clusterctl"
+chmod +x "${prefix}/bin/clusterctl"
+"${prefix}/bin/clusterctl" completion bash >"${prefix}/share/bash-completion/completions/clusterctl"
+"${prefix}/bin/clusterctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_clusterctl"
 EOF
\ No newline at end of file
diff --git a/tools/clusterlint/Dockerfile.template b/tools/clusterlint/Dockerfile.template
index a8e7e22b8b..7f91b68cdb 100644
--- a/tools/clusterlint/Dockerfile.template
+++ b/tools/clusterlint/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "digitalocean/clusterlint" "v${version}" "clusterlint-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/digitalocean/clusterlint/releases/download/v${version}/clusterlint-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
 EOF
\ No newline at end of file
diff --git a/tools/cmctl/Dockerfile.template b/tools/cmctl/Dockerfile.template
index 988d70dea1..6182066d66 100644
--- a/tools/cmctl/Dockerfile.template
+++ b/tools/cmctl/Dockerfile.template
@@ -10,15 +10,15 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cert-manager/cert-manager" "v${version}" "cmctl-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cert-manager/cert-manager/releases/download/v${version}/cmctl-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     cmctl
 
 check-github-release-asset "cert-manager/cert-manager" "v${version}" "kubectl-cert_manager-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cert-manager/cert-manager/releases/download/v${version}/kubectl-cert_manager-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kubectl-cert_manager
 
-"${prefix}${target}/bin/cmctl" completion bash >"${prefix}${target}/share/bash-completion/completions/cmctl"
-"${prefix}${target}/bin/cmctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cmctl.fish"
-"${prefix}${target}/bin/cmctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cmctl"
+"${prefix}/bin/cmctl" completion bash >"${prefix}/share/bash-completion/completions/cmctl"
+"${prefix}/bin/cmctl" completion fish >"${prefix}/share/fish/vendor_completions.d/cmctl.fish"
+"${prefix}/bin/cmctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_cmctl"
 EOF
\ No newline at end of file
diff --git a/tools/cni/Dockerfile.template b/tools/cni/Dockerfile.template
index a5d2d33d45..32ad25e400 100644
--- a/tools/cni/Dockerfile.template
+++ b/tools/cni/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "containernetworking/plugins" "v${version}" "cni-plugins-linux-${alt_arch}-v${version}.tgz"
-mkdir -p "${prefix}${target}/libexec/cni"
+mkdir -p "${prefix}/libexec/cni"
 curl --silent --location --fail "https://github.com/containernetworking/plugins/releases/download/v${version}/cni-plugins-linux-${alt_arch}-v${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/libexec/cni" --no-same-owner
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/cni-dhcp.service" \
+| tar --extract --gzip --directory="${prefix}/libexec/cni" --no-same-owner
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/cni-dhcp.service" \
     "https://github.com/containernetworking/plugins/raw/v${version}/plugins/ipam/dhcp/systemd/cni-dhcp.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/cni-dhcp.socket" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/cni-dhcp.socket" \
     "https://github.com/containernetworking/plugins/raw/v${version}/plugins/ipam/dhcp/systemd/cni-dhcp.socket"
 EOF
\ No newline at end of file
diff --git a/tools/cnitool/Dockerfile.template b/tools/cnitool/Dockerfile.template
index 80bc3c5047..5a4173ead9 100644
--- a/tools/cnitool/Dockerfile.template
+++ b/tools/cnitool/Dockerfile.template
@@ -15,5 +15,5 @@ RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/containernetworking/cni .
 cd cnitool
 CGO_ENABLED=0 go build -ldflags '-s -w' -o cnitool .
-cp cnitool "${prefix}${target}/bin/"
+cp cnitool "${prefix}/bin/"
 EOF
diff --git a/tools/cntr/Dockerfile.template b/tools/cntr/Dockerfile.template
index 0b5ebe7563..693af52dc2 100644
--- a/tools/cntr/Dockerfile.template
+++ b/tools/cntr/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "Mic92/cntr" "${version}" "cntr-bin-${version}-${arch}-unknown-linux-musl"
-curl --silent --location --fail --output "${prefix}${target}/bin/cntr" \
+curl --silent --location --fail --output "${prefix}/bin/cntr" \
     "https://github.com/Mic92/cntr/releases/download/${version}/cntr-bin-${version}-${arch}-unknown-linux-musl"
-chmod +x "${prefix}${target}/bin/cntr"
+chmod +x "${prefix}/bin/cntr"
 EOF
\ No newline at end of file
diff --git a/tools/cockroach/Dockerfile.template b/tools/cockroach/Dockerfile.template
index be577c0f61..07df1b07e7 100644
--- a/tools/cockroach/Dockerfile.template
+++ b/tools/cockroach/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-download "https://binaries.cockroachdb.com/cockroach-v${version}.linux-${alt_arch}.tgz"
 curl --silent --location --fail "https://binaries.cockroachdb.com/cockroach-v${version}.linux-${alt_arch}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner
-mkdir -p "${prefix}${target}/lib/cockroach"
-mv "${prefix}${target}/bin/lib/libgeos.so" "${prefix}${target}/lib/cockroach/"
-mv "${prefix}${target}/bin/lib/libgeos_c.so" "${prefix}${target}/lib/cockroach/"
-rmdir "${prefix}${target}/bin/lib"
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner
+mkdir -p "${prefix}/lib/cockroach"
+mv "${prefix}/bin/lib/libgeos.so" "${prefix}/lib/cockroach/"
+mv "${prefix}/bin/lib/libgeos_c.so" "${prefix}/lib/cockroach/"
+rmdir "${prefix}/bin/lib"
 EOF
\ No newline at end of file
diff --git a/tools/code-server/Dockerfile.template b/tools/code-server/Dockerfile.template
index 052294fb7a..b8f9234594 100644
--- a/tools/code-server/Dockerfile.template
+++ b/tools/code-server/Dockerfile.template
@@ -11,5 +11,5 @@ RUN <<EOF
 check-github-release-asset "coder/code-server" "v${version}" "code-server-${version}-linux-${alt_arch}.tar.gz"
 
 curl --silent --location --fail "https://github.com/coder/code-server/releases/download/v${version}/code-server-${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/" --strip-components=1 --no-same-owner
+| tar --extract --gzip --directory="${prefix}/" --strip-components=1 --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/coder/Dockerfile.template b/tools/coder/Dockerfile.template
index 507088d21d..adc7bd130d 100644
--- a/tools/coder/Dockerfile.template
+++ b/tools/coder/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "coder/coder" "v${version}" "coder_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/coder/coder/releases/download/v${version}/coder_${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 \
     ./coder
 EOF
\ No newline at end of file
diff --git a/tools/colima/Dockerfile.template b/tools/colima/Dockerfile.template
index b2ddc16a0d..e340154291 100644
--- a/tools/colima/Dockerfile.template
+++ b/tools/colima/Dockerfile.template
@@ -11,10 +11,10 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "abiosoft/colima" "v${version}" "colima-Linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/colima" \
+curl --silent --location --fail --output "${prefix}/bin/colima" \
     "https://github.com/abiosoft/colima/releases/download/v${version}/colima-Linux-${arch}"
-chmod +x "${prefix}${target}/bin/colima"
-"${prefix}${target}/bin/colima" completion bash >"${prefix}${target}/share/bash-completion/completions/colima"
-"${prefix}${target}/bin/colima" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/colima.fish"
-"${prefix}${target}/bin/colima" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_colima"
+chmod +x "${prefix}/bin/colima"
+"${prefix}/bin/colima" completion bash >"${prefix}/share/bash-completion/completions/colima"
+"${prefix}/bin/colima" completion fish >"${prefix}/share/fish/vendor_completions.d/colima.fish"
+"${prefix}/bin/colima" completion zsh >"${prefix}/share/zsh/vendor-completions/_colima"
 EOF
\ No newline at end of file
diff --git a/tools/composerize/Dockerfile.template b/tools/composerize/Dockerfile.template
index 6d15ea983d..5b385c6dce 100644
--- a/tools/composerize/Dockerfile.template
+++ b/tools/composerize/Dockerfile.template
@@ -12,12 +12,12 @@ ARG name
 ARG version
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
-WORKDIR ${prefix}${target}/libexec/composerize
+WORKDIR ${prefix}/libexec/composerize
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "composerize@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/composerize/node_modules/.bin/composerize" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/composerize/node_modules/.bin/composerize" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/concourse/Dockerfile.template b/tools/concourse/Dockerfile.template
index 3cc2c67f64..f46148a769 100644
--- a/tools/concourse/Dockerfile.template
+++ b/tools/concourse/Dockerfile.template
@@ -12,13 +12,13 @@ ARG version
 RUN <<EOF
 check-github-release-asset "concourse/concourse" "v${version}" "fly-${version}-linux-amd64.tgz"
 curl --silent --location --fail "https://github.com/concourse/concourse/releases/download/v${version}/fly-${version}-linux-amd64.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 
 check-github-release-asset "concourse/concourse" "v${version}" "concourse-${version}-linux-amd64.tgz"
 curl --silent --location --fail "https://github.com/concourse/concourse/releases/download/v${version}/concourse-${version}-linux-amd64.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=2 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=2 --no-same-owner \
     concourse/bin/concourse
 
-"${prefix}${target}/bin/fly" completion --shell=bash >"${prefix}${target}/share/bash-completion/completions/fly"
-"${prefix}${target}/bin/fly" completion --shell=zsh >"${prefix}${target}/share/zsh/vendor-completions/_fly"
+"${prefix}/bin/fly" completion --shell=bash >"${prefix}/share/bash-completion/completions/fly"
+"${prefix}/bin/fly" completion --shell=zsh >"${prefix}/share/zsh/vendor-completions/_fly"
 EOF
\ No newline at end of file
diff --git a/tools/conftest/Dockerfile.template b/tools/conftest/Dockerfile.template
index 420d770738..72e6e9da43 100644
--- a/tools/conftest/Dockerfile.template
+++ b/tools/conftest/Dockerfile.template
@@ -12,9 +12,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "open-policy-agent/conftest" "v${version}" "conftest_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/open-policy-agent/conftest/releases/download/v${version}/conftest_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     conftest
-"${prefix}${target}/bin/conftest" completion bash >"${prefix}${target}/share/bash-completion/completions/conftest"
-"${prefix}${target}/bin/conftest" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/conftest.fish"
-"${prefix}${target}/bin/conftest" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_conftest"
+"${prefix}/bin/conftest" completion bash >"${prefix}/share/bash-completion/completions/conftest"
+"${prefix}/bin/conftest" completion fish >"${prefix}/share/fish/vendor_completions.d/conftest.fish"
+"${prefix}/bin/conftest" completion zsh >"${prefix}/share/zsh/vendor-completions/_conftest"
 EOF
\ No newline at end of file
diff --git a/tools/conmon/Dockerfile.template b/tools/conmon/Dockerfile.template
index ffaed193b1..e0a2fddf05 100644
--- a/tools/conmon/Dockerfile.template
+++ b/tools/conmon/Dockerfile.template
@@ -36,17 +36,17 @@ EOF
 WORKDIR /tmp/conmon
 RUN git clone --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/containers/conmon.git .
 RUN <<EOF
-mkdir -p "${prefix}${target}/share/man/man8"
+mkdir -p "${prefix}/share/man/man8"
 make git-vars bin/conmon \
     PKG_CONFIG='pkg-config --static' \
     CFLAGS='-std=c99 -Os -Wall -Wextra -Werror -static' \
     LDFLAGS='-s -w -static'
 make -C docs GOMD2MAN=go-md2man
-mv bin/conmon "${prefix}${target}/bin/conmon"
-mv docs/conmon.8 "${prefix}${target}/share/man/man8"
+mv bin/conmon "${prefix}/bin/conmon"
+mv docs/conmon.8 "${prefix}/share/man/man8"
 EOF
-COPY default.yaml ${prefix}${target}/etc/containers/registries.d/default.yaml
-COPY policy.json ${prefix}${target}/etc/containers/policy.json
-COPY policy.conf ${prefix}${target}/etc/containers/policy.conf
-COPY registry.json ${prefix}${target}/etc/containers/registries.json
-COPY storage.conf ${prefix}${target}/etc/containers/storage.conf
\ No newline at end of file
+COPY default.yaml ${prefix}/etc/containers/registries.d/default.yaml
+COPY policy.json ${prefix}/etc/containers/policy.json
+COPY policy.conf ${prefix}/etc/containers/policy.conf
+COPY registry.json ${prefix}/etc/containers/registries.json
+COPY storage.conf ${prefix}/etc/containers/storage.conf
\ No newline at end of file
diff --git a/tools/containerd/Dockerfile.template b/tools/containerd/Dockerfile.template
index 172145a8ae..7c84727ade 100644
--- a/tools/containerd/Dockerfile.template
+++ b/tools/containerd/Dockerfile.template
@@ -10,30 +10,30 @@ SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=go-md2man / /
 ARG name
 ARG version
-COPY 10-containerd-net.conflist "${prefix}${target}/etc/cni/net.d/"
-COPY runtimes.toml "${prefix}${target}/etc/containerd/conf.d/runtimes.toml"
-COPY snapshotters.toml "${prefix}${target}/etc/containerd/conf.d/snapshotters.toml"
-COPY init-containerd "${prefix}${target}/etc/init.d/containerd"
+COPY 10-containerd-net.conflist "${prefix}/etc/cni/net.d/"
+COPY runtimes.toml "${prefix}/etc/containerd/conf.d/runtimes.toml"
+COPY snapshotters.toml "${prefix}/etc/containerd/conf.d/snapshotters.toml"
+COPY init-containerd "${prefix}/etc/init.d/containerd"
 RUN <<EOF
 check-github-release-asset "containerd/containerd" "v${version}" "containerd-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/containerd/containerd/releases/download/v${version}/containerd-${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
+| tar --extract --gzip --directory="${prefix}" --no-same-owner
 
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/containerd.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/containerd.service" \
     "https://github.com/containerd/containerd/raw/v${version}/containerd.service"
 EOF
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/share/man/man8/containerd-config.8.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man8/containerd-config.8.md" \
     "https://github.com/containerd/containerd/raw/v${version}/docs/man/containerd-config.8.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/containerd-config.toml.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/containerd-config.toml.5.md" \
     "https://github.com/containerd/containerd/raw/v${version}/docs/man/containerd-config.toml.5.md"
 go-md2man \
-    -in "${prefix}${target}/share/man/man8/containerd-config.8.md" \
-    -out "${prefix}${target}/share/man/man8/containerd-config.8"
+    -in "${prefix}/share/man/man8/containerd-config.8.md" \
+    -out "${prefix}/share/man/man8/containerd-config.8"
 go-md2man \
-    -in "${prefix}${target}/share/man/man5/containerd-config.toml.5.md" \
-    -out "${prefix}${target}/share/man/man5/containerd-config.toml.5"
+    -in "${prefix}/share/man/man5/containerd-config.toml.5.md" \
+    -out "${prefix}/share/man/man5/containerd-config.toml.5"
 rm \
-    "${prefix}${target}/share/man/man8/containerd-config.8.md" \
-    "${prefix}${target}/share/man/man5/containerd-config.toml.5.md"
+    "${prefix}/share/man/man8/containerd-config.8.md" \
+    "${prefix}/share/man/man5/containerd-config.toml.5.md"
 EOF
\ No newline at end of file
diff --git a/tools/containers-common/Dockerfile.template b/tools/containers-common/Dockerfile.template
index 9157ecc794..866a56a6bd 100644
--- a/tools/containers-common/Dockerfile.template
+++ b/tools/containers-common/Dockerfile.template
@@ -11,21 +11,21 @@ COPY --link --from=go-md2man / /
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/Containerfile.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/Containerfile.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/Containerfile.5.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/containerignore.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/containerignore.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/containerignore.5.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/containers-mounts.conf.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/containers-mounts.conf.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/containers-mounts.conf.5.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/containers.conf.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/containers.conf.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/containers.conf.5.md"
-go-md2man -in "${prefix}${target}/share/man/man5/Containerfile.5.md"          -out "${prefix}${target}/share/man/man5/Containerfile.5"
-go-md2man -in "${prefix}${target}/share/man/man5/containerignore.5.md"        -out "${prefix}${target}/share/man/man5/containerignore.5"
-go-md2man -in "${prefix}${target}/share/man/man5/containers-mounts.conf.5.md" -out "${prefix}${target}/share/man/man5/containers-mounts.conf.5"
-go-md2man -in "${prefix}${target}/share/man/man5/containers.conf.5.md"        -out "${prefix}${target}/share/man/man5/containers.conf.5"
+go-md2man -in "${prefix}/share/man/man5/Containerfile.5.md"          -out "${prefix}/share/man/man5/Containerfile.5"
+go-md2man -in "${prefix}/share/man/man5/containerignore.5.md"        -out "${prefix}/share/man/man5/containerignore.5"
+go-md2man -in "${prefix}/share/man/man5/containers-mounts.conf.5.md" -out "${prefix}/share/man/man5/containers-mounts.conf.5"
+go-md2man -in "${prefix}/share/man/man5/containers.conf.5.md"        -out "${prefix}/share/man/man5/containers.conf.5"
 rm \
-    "${prefix}${target}/share/man/man5/Containerfile.5.md" \
-    "${prefix}${target}/share/man/man5/containerignore.5.md" \
-    "${prefix}${target}/share/man/man5/containers-mounts.conf.5.md" \
-    "${prefix}${target}/share/man/man5/containers.conf.5.md"
+    "${prefix}/share/man/man5/Containerfile.5.md" \
+    "${prefix}/share/man/man5/containerignore.5.md" \
+    "${prefix}/share/man/man5/containers-mounts.conf.5.md" \
+    "${prefix}/share/man/man5/containers.conf.5.md"
 EOF
\ No newline at end of file
diff --git a/tools/containerssh/Dockerfile.template b/tools/containerssh/Dockerfile.template
index 38ca64bca6..bbfcea537e 100644
--- a/tools/containerssh/Dockerfile.template
+++ b/tools/containerssh/Dockerfile.template
@@ -12,7 +12,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ContainerSSH/ContainerSSH" "v${version}" "containerssh_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ContainerSSH/ContainerSSH/releases/download/v${version}/containerssh_${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 \
     containerssh \
     containerssh-auditlog-decoder \
     containerssh-testauthconfigserver
diff --git a/tools/copa/Dockerfile.template b/tools/copa/Dockerfile.template
index ab23ba7920..1786c65ed8 100644
--- a/tools/copa/Dockerfile.template
+++ b/tools/copa/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "project-copacetic/copacetic" "v${version}" "copa_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/project-copacetic/copacetic/releases/download/v${version}/copa_${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 \
     copa
     
-"${prefix}${target}/bin/copa" completion bash >"${prefix}${target}/share/bash-completion/completions/copa"
-"${prefix}${target}/bin/copa" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/copa.fish"
-"${prefix}${target}/bin/copa" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_copa"
+"${prefix}/bin/copa" completion bash >"${prefix}/share/bash-completion/completions/copa"
+"${prefix}/bin/copa" completion fish >"${prefix}/share/fish/vendor_completions.d/copa.fish"
+"${prefix}/bin/copa" completion zsh >"${prefix}/share/zsh/vendor-completions/_copa"
 EOF
\ No newline at end of file
diff --git a/tools/cosign/Dockerfile.template b/tools/cosign/Dockerfile.template
index 6e597f291f..bab01a861e 100644
--- a/tools/cosign/Dockerfile.template
+++ b/tools/cosign/Dockerfile.template
@@ -30,20 +30,20 @@ ARG version
 RUN <<EOF
 check-github-release-asset "sigstore/cosign" "v${version}" "cosign-linux-${alt_arch}"
 echo "### Installing cosign ${version}"
-curl --silent --location --fail --output "${prefix}${target}/bin/cosign" \
+curl --silent --location --fail --output "${prefix}/bin/cosign" \
     "https://github.com/sigstore/cosign/releases/download/v${version}/cosign-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/cosign"
+chmod +x "${prefix}/bin/cosign"
 
 echo "### Installing shell completion for cosign ${version}"
-"${prefix}${target}/bin/cosign" completion bash >"${prefix}${target}/share/bash-completion/completions/cosign"
-"${prefix}${target}/bin/cosign" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cosign.fish"
-"${prefix}${target}/bin/cosign" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cosign"
+"${prefix}/bin/cosign" completion bash >"${prefix}/share/bash-completion/completions/cosign"
+"${prefix}/bin/cosign" completion fish >"${prefix}/share/fish/vendor_completions.d/cosign.fish"
+"${prefix}/bin/cosign" completion zsh >"${prefix}/share/zsh/vendor-completions/_cosign"
 
 echo "### Checking PGP signature for cosign ${version}"
 curl --silent --location --fail --output "cosign-linux-${alt_arch}.sig" \
     "https://github.com/sigstore/cosign/releases/download/v${version}/cosign-linux-${alt_arch}.sig"
 COSIGN_PUB_KEY="https://github.com/sigstore/cosign/releases/download/v${version}/release-cosign.pub"
-cosign verify-blob --key "${COSIGN_PUB_KEY}" --signature "cosign-linux-${alt_arch}.sig" "${prefix}${target}/bin/cosign"
+cosign verify-blob --key "${COSIGN_PUB_KEY}" --signature "cosign-linux-${alt_arch}.sig" "${prefix}/bin/cosign"
 rm -f "cosign-linux-${alt_arch}.sig"
 
 echo "### Checking keyless signature for cosign ${version}"
@@ -56,8 +56,8 @@ COSIGN_EXPERIMENTAL=1 cosign verify-blob \
     --signature "cosign-linux-${alt_arch}-keyless.sig" \
     --certificate-oidc-issuer https://accounts.google.com \
     --certificate-identity "keyless@projectsigstore.iam.gserviceaccount.com" \
-    "${prefix}${target}/bin/cosign"
+    "${prefix}/bin/cosign"
 rm -f "cosign-linux-${alt_arch}-keyless.pem" "cosign-linux-${alt_arch}-keyless.sig"
 
-"${prefix}${target}/bin/cosign" version
+"${prefix}/bin/cosign" version
 EOF
\ No newline at end of file
diff --git a/tools/cowsay/Dockerfile.template b/tools/cowsay/Dockerfile.template
index 80834111c8..cfe1cfa32c 100644
--- a/tools/cowsay/Dockerfile.template
+++ b/tools/cowsay/Dockerfile.template
@@ -12,12 +12,12 @@ ARG version
 RUN <<EOF
 check-github-release-asset "Code-Hex/Neo-cowsay" "v${version}" "cowsay_${version}_Linux_x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/Code-Hex/Neo-cowsay/releases/download/v${version}/cowsay_${version}_Linux_x86_64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     cowsay \
     cowthink
-curl --silent --location --fail --output "${prefix}${target}/share/man/man1/cowsay.1" \
+curl --silent --location --fail --output "${prefix}/share/man/man1/cowsay.1" \
     "https://github.com/Code-Hex/Neo-cowsay/raw/v${version}/doc/cowsay.1"
 curl --silent --location --fail "https://github.com/Code-Hex/Neo-cowsay/archive/refs/tags/v${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/share" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/share" --strip-components=1 --no-same-owner \
     "Neo-cowsay-${version}/cows"
 EOF
\ No newline at end of file
diff --git a/tools/crane/Dockerfile.template b/tools/crane/Dockerfile.template
index c51050fe5a..b9a5f4eb2c 100644
--- a/tools/crane/Dockerfile.template
+++ b/tools/crane/Dockerfile.template
@@ -23,13 +23,13 @@ check-github-release-asset "google/go-containerregistry" "v${version}" "go-conta
 
 echo "### Downloading crane ${version}"
 curl --silent --location --fail "https://github.com/google/go-containerregistry/releases/download/v${version}/go-containerregistry_Linux_${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     crane
 EOF
 
 FROM download AS prepare
 RUN <<EOF
-"${prefix}${target}/bin/crane" completion bash >"${prefix}${target}/share/bash-completion/completions/crane"
-"${prefix}${target}/bin/crane" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/crane.fish"
-"${prefix}${target}/bin/crane" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_crane"
+"${prefix}/bin/crane" completion bash >"${prefix}/share/bash-completion/completions/crane"
+"${prefix}/bin/crane" completion fish >"${prefix}/share/fish/vendor_completions.d/crane.fish"
+"${prefix}/bin/crane" completion zsh >"${prefix}/share/zsh/vendor-completions/_crane"
 EOF
\ No newline at end of file
diff --git a/tools/cri-dockerd/Dockerfile.template b/tools/cri-dockerd/Dockerfile.template
index d7ca7ec64f..b4d7556dba 100644
--- a/tools/cri-dockerd/Dockerfile.template
+++ b/tools/cri-dockerd/Dockerfile.template
@@ -10,11 +10,11 @@ ARG version
 RUN <<EOF
 check-github-release-asset "Mirantis/cri-dockerd" "v${version}" "cri-dockerd-${version}.${alt_arch}.tgz"
 curl --silent --location --fail "https://github.com/Mirantis/cri-dockerd/releases/download/v${version}/cri-dockerd-${version}.${alt_arch}.tgz" \
-| 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 \
     cri-dockerd
 
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/cri-docker.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/cri-docker.service" \
     "https://github.com/Mirantis/cri-dockerd/raw/v${version}/packaging/systemd/cri-docker.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/cri-docker.socket" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/cri-docker.socket" \
     "https://github.com/Mirantis/cri-dockerd/raw/v${version}/packaging/systemd/cri-docker.socket"
 EOF
\ No newline at end of file
diff --git a/tools/cri-o/Dockerfile.template b/tools/cri-o/Dockerfile.template
index 98aa8c469b..9a678db178 100644
--- a/tools/cri-o/Dockerfile.template
+++ b/tools/cri-o/Dockerfile.template
@@ -12,7 +12,7 @@ COPY --link --from=cosign / /
 COPY --from=go-md2man / /
 ARG name
 ARG version
-COPY crio.conf ${prefix}${target}/etc/crio.conf
+COPY crio.conf ${prefix}/etc/crio.conf
 RUN <<EOF
 echo "### Downloading cri-o ${version}"
 curl --silent --location --fail --remote-name "https://storage.googleapis.com/cri-o/artifacts/cri-o.${alt_arch}.v${version}.tar.gz"
@@ -32,59 +32,59 @@ COSIGN_EXPERIMENTAL=1 cosign verify-blob \
     "cri-o.${alt_arch}.v${version}.tar.gz"
 
 echo "### Installing cri-o ${version}"
-tar --file "cri-o.${alt_arch}.v${version}.tar.gz" --extract --gzip --directory="${prefix}${target}" --strip-components=1 --no-same-owner \
+tar --file "cri-o.${alt_arch}.v${version}.tar.gz" --extract --gzip --directory="${prefix}" --strip-components=1 --no-same-owner \
     cri-o/bin/crio
 EOF
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/share/bash-completion/completions/crio" \
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/crio" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/bash/crio"
-curl --silent --location --fail --output "${prefix}${target}/share/bash-completion/completions/crio-status" \
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/crio-status" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/bash/crio-status"
-curl --silent --location --fail --output "${prefix}${target}/share/fish/vendor_completions.d/crio.fish" \
+curl --silent --location --fail --output "${prefix}/share/fish/vendor_completions.d/crio.fish" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/fish/crio.fish"
-curl --silent --location --fail --output "${prefix}${target}/share/fish/vendor_completions.d/crio-status.fish" \
+curl --silent --location --fail --output "${prefix}/share/fish/vendor_completions.d/crio-status.fish" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/fish/crio-status.fish"
-curl --silent --location --fail --output "${prefix}${target}/share/zsh/vendor-completions/_crio" \
+curl --silent --location --fail --output "${prefix}/share/zsh/vendor-completions/_crio" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/zsh/_crio"
-curl --silent --location --fail --output "${prefix}${target}/share/zsh/vendor-completions/_crio-status" \
+curl --silent --location --fail --output "${prefix}/share/zsh/vendor-completions/_crio-status" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/zsh/_crio-status"
 EOF
 RUN <<EOF
 mkdir -p \
-    "${prefix}${target}/etc/sysconfig"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/crio.service" \
+    "${prefix}/etc/sysconfig"
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/crio.service" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/systemd/crio.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/crio-wipe.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/crio-wipe.service" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/systemd/crio-wipe.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/sysconfig/crio" \
+curl --silent --location --fail --output "${prefix}/etc/sysconfig/crio" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/sysconfig/crio"
 EOF
 RUN <<EOF
 mkdir -p \
-    "${prefix}${target}/etc/cni/net.d"
-curl --silent --location --fail --output "${prefix}${target}/etc/cni/net.d/10-crio-bridge.conflist" \
+    "${prefix}/etc/cni/net.d"
+curl --silent --location --fail --output "${prefix}/etc/cni/net.d/10-crio-bridge.conflist" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/cni/10-crio-bridge.conflist"
-curl --silent --location --fail --output "${prefix}${target}/etc/cni/net.d/11-crio-ipv4-bridge.conflist" \
+curl --silent --location --fail --output "${prefix}/etc/cni/net.d/11-crio-ipv4-bridge.conflist" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/cni/11-crio-ipv4-bridge.conflist"
-curl --silent --location --fail --output "${prefix}${target}/etc/cni/net.d/99-loopback.conflist" \
+curl --silent --location --fail --output "${prefix}/etc/cni/net.d/99-loopback.conflist" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/cni/99-loopback.conflist"
 EOF
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/share/man/man8/crio.8.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man8/crio.8.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio.8.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man8/crio-status.8.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man8/crio-status.8.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio-status.8.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/crio.conf.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/crio.conf.5.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio.conf.5.md"
-curl --silent --location --fail --output "${prefix}${target}/share/man/man5/crio.conf.d.5.md" \
+curl --silent --location --fail --output "${prefix}/share/man/man5/crio.conf.d.5.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio.conf.d.5.md"
-go-md2man -in "${prefix}${target}/share/man/man8/crio.8.md"        -out "${prefix}${target}/share/man/man8/crio.8"
-go-md2man -in "${prefix}${target}/share/man/man8/crio-status.8.md" -out "${prefix}${target}/share/man/man8/crio-status.8"
-go-md2man -in "${prefix}${target}/share/man/man5/crio.conf.5.md"   -out "${prefix}${target}/share/man/man5/crio.conf.5"
-go-md2man -in "${prefix}${target}/share/man/man5/crio.conf.d.5.md" -out "${prefix}${target}/share/man/man5/crio.conf.d.5"
+go-md2man -in "${prefix}/share/man/man8/crio.8.md"        -out "${prefix}/share/man/man8/crio.8"
+go-md2man -in "${prefix}/share/man/man8/crio-status.8.md" -out "${prefix}/share/man/man8/crio-status.8"
+go-md2man -in "${prefix}/share/man/man5/crio.conf.5.md"   -out "${prefix}/share/man/man5/crio.conf.5"
+go-md2man -in "${prefix}/share/man/man5/crio.conf.d.5.md" -out "${prefix}/share/man/man5/crio.conf.d.5"
 rm \
-    "${prefix}${target}/share/man/man8/crio.8.md" \
-    "${prefix}${target}/share/man/man8/crio-status.8.md" \
-    "${prefix}${target}/share/man/man5/crio.conf.5.md" \
-    "${prefix}${target}/share/man/man5/crio.conf.d.5.md"
+    "${prefix}/share/man/man8/crio.8.md" \
+    "${prefix}/share/man/man8/crio-status.8.md" \
+    "${prefix}/share/man/man5/crio.conf.5.md" \
+    "${prefix}/share/man/man5/crio.conf.d.5.md"
 EOF
\ No newline at end of file
diff --git a/tools/crictl/Dockerfile.template b/tools/crictl/Dockerfile.template
index 5486c3a928..a830b90736 100644
--- a/tools/crictl/Dockerfile.template
+++ b/tools/crictl/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/cri-tools" "v${version}" "crictl-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${version}/crictl-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
 EOF
 COPY crictl.yaml "${prefix}/etc/"
\ No newline at end of file
diff --git a/tools/croc/Dockerfile.template b/tools/croc/Dockerfile.template
index f06bd8e99b..583b776c0e 100644
--- a/tools/croc/Dockerfile.template
+++ b/tools/croc/Dockerfile.template
@@ -27,11 +27,11 @@ check-github-release-asset "schollz/croc" "v${version}" "croc_${version}_Linux-$
 
 echo "### Downloading croc ${version}"
 curl --silent --location --fail "https://github.com/schollz/croc/releases/download/v${version}/croc_${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 \
     croc \
     bash_autocomplete \
     zsh_autocomplete
 
-mv "${prefix}${target}/bin/bash_autocomplete" "${prefix}${target}/share/bash-completion/completions/croc"
-mv "${prefix}${target}/bin/zsh_autocomplete"  "${prefix}${target}/share/zsh/vendor-completions/_croc"
+mv "${prefix}/bin/bash_autocomplete" "${prefix}/share/bash-completion/completions/croc"
+mv "${prefix}/bin/zsh_autocomplete"  "${prefix}/share/zsh/vendor-completions/_croc"
 EOF
\ No newline at end of file
diff --git a/tools/crossplane/Dockerfile.template b/tools/crossplane/Dockerfile.template
index 76d48b71a6..cdb41aa458 100644
--- a/tools/crossplane/Dockerfile.template
+++ b/tools/crossplane/Dockerfile.template
@@ -8,7 +8,7 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kubectl-crossplane" \
+curl --silent --location --fail --output "${prefix}/bin/kubectl-crossplane" \
     "https://releases.crossplane.io/stable/v${version}/bin/linux_${alt_arch}/crank"
-chmod +x "${prefix}${target}/bin/kubectl-crossplane"
+chmod +x "${prefix}/bin/kubectl-crossplane"
 EOF
\ No newline at end of file
diff --git a/tools/crun/Dockerfile.template b/tools/crun/Dockerfile.template
index f6581137ae..050f44bcac 100644
--- a/tools/crun/Dockerfile.template
+++ b/tools/crun/Dockerfile.template
@@ -17,5 +17,5 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=build /usr/local/bin/ ${prefix}${target}/bin/
-COPY --link --from=build /usr/local/share/man/man1/ ${prefix}${target}/share/man/man1/
\ No newline at end of file
+COPY --link --from=build /usr/local/bin/ ${prefix}/bin/
+COPY --link --from=build /usr/local/share/man/man1/ ${prefix}/share/man/man1/
\ No newline at end of file
diff --git a/tools/ct/Dockerfile.template b/tools/ct/Dockerfile.template
index 09dd4a79f1..7b04fccf36 100644
--- a/tools/ct/Dockerfile.template
+++ b/tools/ct/Dockerfile.template
@@ -16,5 +16,5 @@ ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/flatcar/container-linux-config-transpiler .
 make
-cp bin/ct "${prefix}${target}/bin/"
+cp bin/ct "${prefix}/bin/"
 EOF
diff --git a/tools/ct_server/Dockerfile.template b/tools/ct_server/Dockerfile.template
index 35c12d19bb..f8f219ed8e 100644
--- a/tools/ct_server/Dockerfile.template
+++ b/tools/ct_server/Dockerfile.template
@@ -10,10 +10,10 @@ SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=go / /
 ARG name
 ARG version
-COPY ct_server.service ${prefix}${target}/etc/systemd/system/ct_server.service
+COPY ct_server.service ${prefix}/etc/systemd/system/ct_server.service
 WORKDIR /go/src/github.com/google/certificate-transparency-go
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/google/certificate-transparency-go .
 export CGO_ENABLED=0
-go build -ldflags "-w -s" -o "${prefix}${target}/bin/ct_server" ./trillian/ctfe/ct_server
+go build -ldflags "-w -s" -o "${prefix}/bin/ct_server" ./trillian/ctfe/ct_server
 EOF
\ No newline at end of file
diff --git a/tools/ctop/Dockerfile.template b/tools/ctop/Dockerfile.template
index ccfdeef8e6..d214a5b1d2 100644
--- a/tools/ctop/Dockerfile.template
+++ b/tools/ctop/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "bcicen/ctop" "v${version}" "ctop-${version}-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/ctop" \
+curl --silent --location --fail --output "${prefix}/bin/ctop" \
     "https://github.com/bcicen/ctop/releases/download/v${version}/ctop-${version}-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/ctop"
+chmod +x "${prefix}/bin/ctop"
 EOF
\ No newline at end of file
diff --git a/tools/cue/Dockerfile.template b/tools/cue/Dockerfile.template
index 282e9686d8..038c84a1f3 100644
--- a/tools/cue/Dockerfile.template
+++ b/tools/cue/Dockerfile.template
@@ -12,9 +12,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cue-lang/cue" "v${version}" "cue_v${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cue-lang/cue/releases/download/v${version}/cue_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 \
     cue
-"${prefix}${target}/bin/cue" completion bash >"${prefix}${target}/share/bash-completion/completions/cue"
-"${prefix}${target}/bin/cue" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cue.fish"
-"${prefix}${target}/bin/cue" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_cue"
+"${prefix}/bin/cue" completion bash >"${prefix}/share/bash-completion/completions/cue"
+"${prefix}/bin/cue" completion fish >"${prefix}/share/fish/vendor_completions.d/cue.fish"
+"${prefix}/bin/cue" completion zsh >"${prefix}/share/zsh/vendor-completions/_cue"
 EOF
\ No newline at end of file
diff --git a/tools/curl/Dockerfile.template b/tools/curl/Dockerfile.template
index ae6809a2d5..437977dbd4 100644
--- a/tools/curl/Dockerfile.template
+++ b/tools/curl/Dockerfile.template
@@ -48,4 +48,4 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=build /usr/local/ ${prefix}${target}/
\ No newline at end of file
+COPY --from=build /usr/local/ ${prefix}/
\ No newline at end of file
diff --git a/tools/curlie/Dockerfile.template b/tools/curlie/Dockerfile.template
index f97f9ad090..bea8998525 100644
--- a/tools/curlie/Dockerfile.template
+++ b/tools/curlie/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "rs/curlie" "v${version}" "curlie_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/rs/curlie/releases/download/v${version}/curlie_${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 \
     curlie
 EOF
\ No newline at end of file
diff --git a/tools/cve-bin-tool/Dockerfile.template b/tools/cve-bin-tool/Dockerfile.template
index 06f90bb9bd..796f0837f2 100644
--- a/tools/cve-bin-tool/Dockerfile.template
+++ b/tools/cve-bin-tool/Dockerfile.template
@@ -20,5 +20,5 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/cve-bin-tool" --console-script cve-bin-tool "cve-bin-tool==${version}"
+shiv --output-file "${prefix}/bin/cve-bin-tool" --console-script cve-bin-tool "cve-bin-tool==${version}"
 EOF
diff --git a/tools/cyclonedx-cli/Dockerfile.template b/tools/cyclonedx-cli/Dockerfile.template
index 763a94058c..40c42a7a9b 100644
--- a/tools/cyclonedx-cli/Dockerfile.template
+++ b/tools/cyclonedx-cli/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "CycloneDX/cyclonedx-cli" "v${version}" "cyclonedx-linux-x64"
-curl --silent --location --fail --output "${prefix}${target}/bin/cyclonedx-cli" \
+curl --silent --location --fail --output "${prefix}/bin/cyclonedx-cli" \
     "https://github.com/CycloneDX/cyclonedx-cli/releases/download/v${version}/cyclonedx-linux-x64"
-chmod +x "${prefix}${target}/bin/cyclonedx-cli"
+chmod +x "${prefix}/bin/cyclonedx-cli"
 EOF
\ No newline at end of file
diff --git a/tools/cyclonedx-gomod/Dockerfile.template b/tools/cyclonedx-gomod/Dockerfile.template
index 1ea1120cc4..d3325b925e 100644
--- a/tools/cyclonedx-gomod/Dockerfile.template
+++ b/tools/cyclonedx-gomod/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "CycloneDX/cyclonedx-gomod" "v${version}" "cyclonedx-gomod_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/CycloneDX/cyclonedx-gomod/releases/download/v${version}/cyclonedx-gomod_${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 \
     cyclonedx-gomod
 EOF
\ No newline at end of file
diff --git a/tools/cypher-shell/Dockerfile.template b/tools/cypher-shell/Dockerfile.template
index ce29bddf64..6e132d97b4 100644
--- a/tools/cypher-shell/Dockerfile.template
+++ b/tools/cypher-shell/Dockerfile.template
@@ -8,11 +8,11 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
-mkdir -p "${prefix}${target}/opt"
+mkdir -p "${prefix}/opt"
 url="https://dist.neo4j.org/cypher-shell/cypher-shell-${version}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/opt/" "${filename}"
-mv "${prefix}${target}/opt/cypher-shell-${version}" "${prefix}${target}/opt/cypher-shell"
-ln --symbolic --relative --force "${target}/opt/cypher-shell/bin/cypher-shell" "${prefix}${target}/bin/"
+unzip -q -o -d "${prefix}/opt/" "${filename}"
+mv "${prefix}/opt/cypher-shell-${version}" "${prefix}/opt/cypher-shell"
+ln --symbolic --relative --force "/opt/cypher-shell/bin/cypher-shell" "${prefix}/bin/"
 EOF
\ No newline at end of file

From 115a7b68a9b7fcc64e269ee62ed3becb947661bb Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sun, 31 Dec 2023 13:29:48 +0100
Subject: [PATCH 3/4] Removed cas #2213

---
 tools/cas/Dockerfile.template | 18 ------------------
 tools/cas/manifest.yaml       | 15 ---------------
 2 files changed, 33 deletions(-)
 delete mode 100644 tools/cas/Dockerfile.template
 delete mode 100644 tools/cas/manifest.yaml

diff --git a/tools/cas/Dockerfile.template b/tools/cas/Dockerfile.template
deleted file mode 100644
index 6701d1ae53..0000000000
--- a/tools/cas/Dockerfile.template
+++ /dev/null
@@ -1,18 +0,0 @@
-#syntax=docker/dockerfile:1.6.0
-
-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
-check-github-release-asset "codenotary/cas" "v${version}" "cas-v${version}-linux-${alt_arch}-static"
-curl --silent --location --fail --output "${prefix}/bin/cas" \
-    "https://github.com/codenotary/cas/releases/download/v${version}/cas-v${version}-linux-${alt_arch}-static"
-chmod +x "${prefix}/bin/cas"
-"${prefix}/bin/cas" completion bash >"${prefix}/share/bash-completion/completions/cas"
-"${prefix}/bin/cas" completion fish >"${prefix}/share/fish/vendor_completions.d/cas.fish"
-"${prefix}/bin/cas" completion zsh >"${prefix}/share/zsh/vendor-completions/_cas"
-EOF
\ No newline at end of file
diff --git a/tools/cas/manifest.yaml b/tools/cas/manifest.yaml
deleted file mode 100644
index 53676c160b..0000000000
--- a/tools/cas/manifest.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: cas
-version: "1.0.3"
-check: ${binary} --version | cut -d' ' -f3 | tr -d v
-tags:
-- type/cli
-- category/security
-- cicd
-- lang/go
-homepage: https://github.com/codenotary/cas
-description: Codenotary Community Attestation Service (CAS) for notarization and authentication of digital artifacts
-renovate:
-  datasource: github-releases
-  package: codenotary/cas
-  extractVersion: ^v(?<version>.+?)$
-  priority: low

From 737d2a31f83e69968e49e069fff3df17471f6508 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sun, 31 Dec 2023 16:50:17 +0100
Subject: [PATCH 4/4] Fixed build #2213

---
 tools/cdxgen/Dockerfile.template      | 6 +++---
 tools/checkov/Dockerfile.template     | 4 ++--
 tools/composerize/Dockerfile.template | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/cdxgen/Dockerfile.template b/tools/cdxgen/Dockerfile.template
index f3e4011970..e2169c0afe 100644
--- a/tools/cdxgen/Dockerfile.template
+++ b/tools/cdxgen/Dockerfile.template
@@ -10,9 +10,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/cdxgen
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/cdxgen
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/checkov/Dockerfile.template b/tools/checkov/Dockerfile.template
index d4f5479da9..c155e8eceb 100644
--- a/tools/checkov/Dockerfile.template
+++ b/tools/checkov/Dockerfile.template
@@ -8,8 +8,8 @@ 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 / /
+#COPY --link --from=python / /usr/local/
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/composerize/Dockerfile.template b/tools/composerize/Dockerfile.template
index 5b385c6dce..a310bc66df 100644
--- a/tools/composerize/Dockerfile.template
+++ b/tools/composerize/Dockerfile.template
@@ -10,9 +10,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/composerize
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/composerize
 ARG name
 ARG version
 RUN <<EOF