From 90e8e42fda8bfeafee2d4472d8578a207545134a Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 21 Dec 2023 14:51:28 +0100
Subject: [PATCH 1/4] Remove target for k* #2213

---
 tools/k0s/Dockerfile.template                     |  8 +++++---
 tools/k0sctl/Dockerfile.template                  |  8 +++++---
 tools/k2d/Dockerfile.template                     | 12 +++++++-----
 tools/k3d/Dockerfile.template                     |  8 +++++---
 tools/k3s/Dockerfile.template                     |  8 +++++---
 tools/k3sup/Dockerfile.template                   |  8 +++++---
 tools/k6/Dockerfile.template                      |  8 +++++---
 tools/k8s-tew/Dockerfile.template                 |  8 +++++---
 tools/k8spacket/Dockerfile.template               |  8 +++++---
 tools/k9s/Dockerfile.template                     |  8 +++++---
 tools/kapp/Dockerfile.template                    |  8 +++++---
 tools/katana/Dockerfile.template                  |  8 +++++---
 tools/kbld/Dockerfile.template                    |  8 +++++---
 tools/kbom/Dockerfile.template                    |  8 +++++---
 tools/kbrew/Dockerfile.template                   |  8 +++++---
 tools/kcount/Dockerfile.template                  |  8 +++++---
 tools/kcp/Dockerfile.template                     |  8 +++++---
 tools/kd/Dockerfile.template                      |  8 +++++---
 tools/kdo/Dockerfile.template                     |  8 +++++---
 tools/ketch/Dockerfile.template                   |  8 +++++---
 tools/kexp/Dockerfile.template                    |  8 +++++---
 tools/keybase/Dockerfile.template                 | 10 ++++++----
 tools/keyoxide/Dockerfile.template                | 12 +++++++-----
 tools/kgctl/Dockerfile.template                   |  8 +++++---
 tools/kind/Dockerfile.template                    |  8 +++++---
 tools/kink/Dockerfile.template                    |  8 +++++---
 tools/kitt/Dockerfile.template                    | 14 ++++++++------
 tools/kitty/Dockerfile.template                   |  8 +++++---
 tools/kluctl/Dockerfile.template                  |  8 +++++---
 tools/kmon/Dockerfile.template                    |  8 +++++---
 tools/kn/Dockerfile.template                      |  8 +++++---
 tools/kompose/Dockerfile.template                 |  8 +++++---
 tools/konf/Dockerfile.template                    |  8 +++++---
 tools/kots/Dockerfile.template                    |  8 +++++---
 tools/kp/Dockerfile.template                      |  8 +++++---
 tools/kpt/Dockerfile.template                     |  8 +++++---
 tools/krew/Dockerfile.template                    |  8 +++++---
 tools/ksort/Dockerfile.template                   |  8 +++++---
 tools/ktop/Dockerfile.template                    |  8 +++++---
 tools/ktunnel/Dockerfile.template                 |  8 +++++---
 tools/kube-apiserver/Dockerfile.template          | 10 ++++++----
 tools/kube-bench/Dockerfile.template              |  8 +++++---
 tools/kube-controller-manager/Dockerfile.template | 10 ++++++----
 tools/kube-linter/Dockerfile.template             |  8 +++++---
 tools/kube-proxy/Dockerfile.template              | 10 ++++++----
 tools/kube-psp-advisor/Dockerfile.template        |  8 +++++---
 tools/kube-scheduler/Dockerfile.template          | 10 ++++++----
 tools/kube-score/Dockerfile.template              |  8 +++++---
 tools/kubeadm/Dockerfile.template                 | 10 ++++++----
 tools/kubeaudit/Dockerfile.template               |  8 +++++---
 tools/kubebox/Dockerfile.template                 | 12 +++++++-----
 tools/kubeclarity-cli/Dockerfile.template         |  8 +++++---
 tools/kubecolor/Dockerfile.template               |  8 +++++---
 tools/kubeconform/Dockerfile.template             |  8 +++++---
 tools/kubectl-aliases/Dockerfile.template         |  8 +++++---
 tools/kubectl-build/Dockerfile.template           |  8 +++++---
 tools/kubectl-free/Dockerfile.template            |  8 +++++---
 tools/kubectl-plugins/Dockerfile.template         | 10 ++++++----
 tools/kubectl-resources/Dockerfile.template       |  8 +++++---
 tools/kubectl-ssh-proxy/Dockerfile.template       |  8 +++++---
 tools/kubectl/Dockerfile.template                 | 10 ++++++----
 tools/kubefire/Dockerfile.template                |  8 +++++---
 tools/kubelet/Dockerfile.template                 | 10 ++++++----
 tools/kubeletctl/Dockerfile.template              |  8 +++++---
 tools/kubent/Dockerfile.template                  |  8 +++++---
 tools/kubernetes-json-schema/Dockerfile.template  |  8 +++++---
 tools/kubescape/Dockerfile.template               |  8 +++++---
 tools/kubeseal/Dockerfile.template                |  8 +++++---
 tools/kubesec/Dockerfile.template                 |  8 +++++---
 tools/kubeshark/Dockerfile.template               |  8 +++++---
 tools/kubeswitch/Dockerfile.template              |  8 +++++---
 tools/kubeval/Dockerfile.template                 |  8 +++++---
 tools/kubo/Dockerfile.template                    |  8 +++++---
 tools/kudo/Dockerfile.template                    |  8 +++++---
 tools/kustomize/Dockerfile.template               |  8 +++++---
 tools/kustomizer/Dockerfile.template              |  8 +++++---
 tools/kuttl/Dockerfile.template                   |  8 +++++---
 tools/kwok/Dockerfile.template                    |  8 +++++---
 tools/kyverno/Dockerfile.template                 |  8 +++++---
 79 files changed, 413 insertions(+), 255 deletions(-)

diff --git a/tools/k0s/Dockerfile.template b/tools/k0s/Dockerfile.template
index de36f7eb3a..fb643318cc 100644
--- a/tools/k0s/Dockerfile.template
+++ b/tools/k0s/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/k0sctl/Dockerfile.template b/tools/k0sctl/Dockerfile.template
index ce8ed313e4..1d9fb8ab09 100644
--- a/tools/k0sctl/Dockerfile.template
+++ b/tools/k0sctl/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/k2d/Dockerfile.template b/tools/k2d/Dockerfile.template
index dab4150170..d1e06511e9 100644
--- a/tools/k2d/Dockerfile.template
+++ b/tools/k2d/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/portainer/k2d
diff --git a/tools/k3d/Dockerfile.template b/tools/k3d/Dockerfile.template
index 5279c58249..6fffef4a57 100644
--- a/tools/k3d/Dockerfile.template
+++ b/tools/k3d/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/k3s/Dockerfile.template b/tools/k3s/Dockerfile.template
index c51455556e..cb9f63520b 100644
--- a/tools/k3s/Dockerfile.template
+++ b/tools/k3s/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 COPY k3s.service ${prefix}${target}/etc/systemd/system/
diff --git a/tools/k3sup/Dockerfile.template b/tools/k3sup/Dockerfile.template
index 58879abd9d..c567fb4644 100644
--- a/tools/k3sup/Dockerfile.template
+++ b/tools/k3sup/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/k6/Dockerfile.template b/tools/k6/Dockerfile.template
index 8b47a736cf..e737bad672 100644
--- a/tools/k6/Dockerfile.template
+++ b/tools/k6/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/k8s-tew/Dockerfile.template b/tools/k8s-tew/Dockerfile.template
index 122d246f61..156999f5c5 100644
--- a/tools/k8s-tew/Dockerfile.template
+++ b/tools/k8s-tew/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/k8spacket/Dockerfile.template b/tools/k8spacket/Dockerfile.template
index e44369c70c..072697305e 100644
--- a/tools/k8spacket/Dockerfile.template
+++ b/tools/k8spacket/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM golang:1.21.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 AS build
 RUN <<EOF
 apt-get update
@@ -20,7 +18,11 @@ git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}"
 go build -o /usr/local/bin/k8spacket .
 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/bin/k8spacket ${prefix}${target}/bin/
diff --git a/tools/k9s/Dockerfile.template b/tools/k9s/Dockerfile.template
index 9032de540e..f4f3162d68 100644
--- a/tools/k9s/Dockerfile.template
+++ b/tools/k9s/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/kapp/Dockerfile.template b/tools/kapp/Dockerfile.template
index 3cfeebf456..ab997cfdec 100644
--- a/tools/kapp/Dockerfile.template
+++ b/tools/kapp/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/katana/Dockerfile.template b/tools/katana/Dockerfile.template
index b4ff9593c0..babf8f002e 100644
--- a/tools/katana/Dockerfile.template
+++ b/tools/katana/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/kbld/Dockerfile.template b/tools/kbld/Dockerfile.template
index df7ef33337..68cd2d36ce 100644
--- a/tools/kbld/Dockerfile.template
+++ b/tools/kbld/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/kbom/Dockerfile.template b/tools/kbom/Dockerfile.template
index 1b523f7e7e..442821a0d2 100644
--- a/tools/kbom/Dockerfile.template
+++ b/tools/kbom/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/kbrew/Dockerfile.template b/tools/kbrew/Dockerfile.template
index 547d975a8b..d6a2bbacb7 100644
--- a/tools/kbrew/Dockerfile.template
+++ b/tools/kbrew/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/kcount/Dockerfile.template b/tools/kcount/Dockerfile.template
index e6a7ae1e2e..a01e4c106d 100644
--- a/tools/kcount/Dockerfile.template
+++ b/tools/kcount/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/kcp/Dockerfile.template b/tools/kcp/Dockerfile.template
index ac0c563ba6..66cdb70039 100644
--- a/tools/kcp/Dockerfile.template
+++ b/tools/kcp/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
 
diff --git a/tools/kd/Dockerfile.template b/tools/kd/Dockerfile.template
index 3832cbe5b1..38fed56852 100644
--- a/tools/kd/Dockerfile.template
+++ b/tools/kd/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/kdo/Dockerfile.template b/tools/kdo/Dockerfile.template
index 26623545b9..e417558866 100644
--- a/tools/kdo/Dockerfile.template
+++ b/tools/kdo/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/ketch/Dockerfile.template b/tools/ketch/Dockerfile.template
index ecfa8446fc..e9bf3c25ec 100644
--- a/tools/ketch/Dockerfile.template
+++ b/tools/ketch/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/kexp/Dockerfile.template b/tools/kexp/Dockerfile.template
index 82eb983a57..b5948c6f20 100644
--- a/tools/kexp/Dockerfile.template
+++ b/tools/kexp/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/keybase/Dockerfile.template b/tools/keybase/Dockerfile.template
index f10bf11059..d3fefcb57e 100644
--- a/tools/keybase/Dockerfile.template
+++ b/tools/keybase/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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/keyoxide/Dockerfile.template b/tools/keyoxide/Dockerfile.template
index 296ec66afc..e7b78269b1 100644
--- a/tools/keyoxide/Dockerfile.template
+++ b/tools/keyoxide/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" ]
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
 WORKDIR ${prefix}${target}/libexec/keyoxide
diff --git a/tools/kgctl/Dockerfile.template b/tools/kgctl/Dockerfile.template
index fca135952b..6c1139386e 100644
--- a/tools/kgctl/Dockerfile.template
+++ b/tools/kgctl/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/kind/Dockerfile.template b/tools/kind/Dockerfile.template
index c3590c4a11..56ad511035 100644
--- a/tools/kind/Dockerfile.template
+++ b/tools/kind/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/kink/Dockerfile.template b/tools/kink/Dockerfile.template
index c3add86368..16276b3975 100644
--- a/tools/kink/Dockerfile.template
+++ b/tools/kink/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/kitt/Dockerfile.template b/tools/kitt/Dockerfile.template
index 8367f40577..b6b324699b 100644
--- a/tools/kitt/Dockerfile.template
+++ b/tools/kitt/Dockerfile.template
@@ -1,13 +1,15 @@
 #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 / /usr/local/
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/kitty/Dockerfile.template b/tools/kitty/Dockerfile.template
index a35d91bf40..0b34fe9ef7 100644
--- a/tools/kitty/Dockerfile.template
+++ b/tools/kitty/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/kluctl/Dockerfile.template b/tools/kluctl/Dockerfile.template
index 8da5faf3a5..b7ea48385f 100644
--- a/tools/kluctl/Dockerfile.template
+++ b/tools/kluctl/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/kmon/Dockerfile.template b/tools/kmon/Dockerfile.template
index a81ec6408b..766ac4ad6a 100644
--- a/tools/kmon/Dockerfile.template
+++ b/tools/kmon/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/kn/Dockerfile.template b/tools/kn/Dockerfile.template
index cb92e2137e..376c59ab44 100644
--- a/tools/kn/Dockerfile.template
+++ b/tools/kn/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/kompose/Dockerfile.template b/tools/kompose/Dockerfile.template
index 442fed3e9e..0a9ae8cba2 100644
--- a/tools/kompose/Dockerfile.template
+++ b/tools/kompose/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/konf/Dockerfile.template b/tools/konf/Dockerfile.template
index 9ec2b7007b..5c1384cf90 100644
--- a/tools/konf/Dockerfile.template
+++ b/tools/konf/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 COPY <<EOF ${prefix}${target}/etc/profile.d/konf.sh
diff --git a/tools/kots/Dockerfile.template b/tools/kots/Dockerfile.template
index b6526f3240..2af420f6cb 100644
--- a/tools/kots/Dockerfile.template
+++ b/tools/kots/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/kp/Dockerfile.template b/tools/kp/Dockerfile.template
index b1fd71a131..58611f89d6 100644
--- a/tools/kp/Dockerfile.template
+++ b/tools/kp/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/kpt/Dockerfile.template b/tools/kpt/Dockerfile.template
index cb39d851cb..eeef3daf1d 100644
--- a/tools/kpt/Dockerfile.template
+++ b/tools/kpt/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/krew/Dockerfile.template b/tools/krew/Dockerfile.template
index 2a850da095..1a80e0c228 100644
--- a/tools/krew/Dockerfile.template
+++ b/tools/krew/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/ksort/Dockerfile.template b/tools/ksort/Dockerfile.template
index acb7d9fb1a..743719acdd 100644
--- a/tools/ksort/Dockerfile.template
+++ b/tools/ksort/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/ktop/Dockerfile.template b/tools/ktop/Dockerfile.template
index fce81c8aee..1e5a2ac554 100644
--- a/tools/ktop/Dockerfile.template
+++ b/tools/ktop/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/ktunnel/Dockerfile.template b/tools/ktunnel/Dockerfile.template
index f86df14707..564ac170fc 100644
--- a/tools/ktunnel/Dockerfile.template
+++ b/tools/ktunnel/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/kube-apiserver/Dockerfile.template b/tools/kube-apiserver/Dockerfile.template
index 8521580d5d..dc8d0985f1 100644
--- a/tools/kube-apiserver/Dockerfile.template
+++ b/tools/kube-apiserver/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
diff --git a/tools/kube-bench/Dockerfile.template b/tools/kube-bench/Dockerfile.template
index 340d9a3036..1e5ef7a544 100644
--- a/tools/kube-bench/Dockerfile.template
+++ b/tools/kube-bench/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/kube-controller-manager/Dockerfile.template b/tools/kube-controller-manager/Dockerfile.template
index d87426a7a4..1712bce3e7 100644
--- a/tools/kube-controller-manager/Dockerfile.template
+++ b/tools/kube-controller-manager/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
diff --git a/tools/kube-linter/Dockerfile.template b/tools/kube-linter/Dockerfile.template
index 7d6a67dba9..716133bfd8 100644
--- a/tools/kube-linter/Dockerfile.template
+++ b/tools/kube-linter/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/kube-proxy/Dockerfile.template b/tools/kube-proxy/Dockerfile.template
index 51b35c9465..012a2bda75 100644
--- a/tools/kube-proxy/Dockerfile.template
+++ b/tools/kube-proxy/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
diff --git a/tools/kube-psp-advisor/Dockerfile.template b/tools/kube-psp-advisor/Dockerfile.template
index 35d85183f7..6fb2c3183c 100644
--- a/tools/kube-psp-advisor/Dockerfile.template
+++ b/tools/kube-psp-advisor/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/kube-scheduler/Dockerfile.template b/tools/kube-scheduler/Dockerfile.template
index 195eb6cbfb..8e7062e001 100644
--- a/tools/kube-scheduler/Dockerfile.template
+++ b/tools/kube-scheduler/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
diff --git a/tools/kube-score/Dockerfile.template b/tools/kube-score/Dockerfile.template
index 3f70d6d433..83dfb991b8 100644
--- a/tools/kube-score/Dockerfile.template
+++ b/tools/kube-score/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/kubeadm/Dockerfile.template b/tools/kubeadm/Dockerfile.template
index 85dfcd87c3..618f1fdf1b 100644
--- a/tools/kubeadm/Dockerfile.template
+++ b/tools/kubeadm/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
diff --git a/tools/kubeaudit/Dockerfile.template b/tools/kubeaudit/Dockerfile.template
index f29ec6fc04..8f30483586 100644
--- a/tools/kubeaudit/Dockerfile.template
+++ b/tools/kubeaudit/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/kubebox/Dockerfile.template b/tools/kubebox/Dockerfile.template
index 633f2d3803..8a513a1d67 100644
--- a/tools/kubebox/Dockerfile.template
+++ b/tools/kubebox/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" ]
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
 WORKDIR ${prefix}${target}/libexec/kubebox
diff --git a/tools/kubeclarity-cli/Dockerfile.template b/tools/kubeclarity-cli/Dockerfile.template
index 650599790c..adcbc3d1e9 100644
--- a/tools/kubeclarity-cli/Dockerfile.template
+++ b/tools/kubeclarity-cli/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/kubecolor/Dockerfile.template b/tools/kubecolor/Dockerfile.template
index 45f5a49fbd..d09f60e04c 100644
--- a/tools/kubecolor/Dockerfile.template
+++ b/tools/kubecolor/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/kubeconform/Dockerfile.template b/tools/kubeconform/Dockerfile.template
index 112dc3074c..f8509bd038 100644
--- a/tools/kubeconform/Dockerfile.template
+++ b/tools/kubeconform/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/kubectl-aliases/Dockerfile.template b/tools/kubectl-aliases/Dockerfile.template
index a347181bf6..ac89924430 100644
--- a/tools/kubectl-aliases/Dockerfile.template
+++ b/tools/kubectl-aliases/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/kubectl-build/Dockerfile.template b/tools/kubectl-build/Dockerfile.template
index 12128fce29..dea6bbc269 100644
--- a/tools/kubectl-build/Dockerfile.template
+++ b/tools/kubectl-build/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/kubectl-free/Dockerfile.template b/tools/kubectl-free/Dockerfile.template
index cc04175f11..ce08e3dafb 100644
--- a/tools/kubectl-free/Dockerfile.template
+++ b/tools/kubectl-free/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/kubectl-plugins/Dockerfile.template b/tools/kubectl-plugins/Dockerfile.template
index dd7c460083..919cb7fbac 100644
--- a/tools/kubectl-plugins/Dockerfile.template
+++ b/tools/kubectl-plugins/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 # krew internals:
 # - KREW_ROOT defaults to ~/.krew
 # - Add KREW_ROOT/bin to PATH
@@ -9,9 +7,13 @@ ARG ref=main
 # - KREW_ROOT/store/<name>/<version>/<binary>
 # - KREW_ROOT/bin/<binary> links to binary in store
 
-FROM ghcr.io/uniget-org/tools/krew:${ref} AS krew
+FROM ghcr.io/uniget-org/tools/krew:latest AS krew
 
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=krew / /
 ARG name
 ARG version
diff --git a/tools/kubectl-resources/Dockerfile.template b/tools/kubectl-resources/Dockerfile.template
index 068a65e74f..b1f7dd36ac 100644
--- a/tools/kubectl-resources/Dockerfile.template
+++ b/tools/kubectl-resources/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/kubectl-ssh-proxy/Dockerfile.template b/tools/kubectl-ssh-proxy/Dockerfile.template
index 8e0b83c038..7a433c0852 100644
--- a/tools/kubectl-ssh-proxy/Dockerfile.template
+++ b/tools/kubectl-ssh-proxy/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/kubectl/Dockerfile.template b/tools/kubectl/Dockerfile.template
index 4c759139d3..9c170dddb0 100644
--- a/tools/kubectl/Dockerfile.template
+++ b/tools/kubectl/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-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=cosign / /
diff --git a/tools/kubefire/Dockerfile.template b/tools/kubefire/Dockerfile.template
index 7d5a15fe85..ad0e432f67 100644
--- a/tools/kubefire/Dockerfile.template
+++ b/tools/kubefire/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
 
diff --git a/tools/kubelet/Dockerfile.template b/tools/kubelet/Dockerfile.template
index 74753f1f57..eccd82e27b 100644
--- a/tools/kubelet/Dockerfile.template
+++ b/tools/kubelet/Dockerfile.template
@@ -1,10 +1,12 @@
 #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/cosign:${ref} AS cosign
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
diff --git a/tools/kubeletctl/Dockerfile.template b/tools/kubeletctl/Dockerfile.template
index 3de07db3fe..5c6c8202ea 100644
--- a/tools/kubeletctl/Dockerfile.template
+++ b/tools/kubeletctl/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/kubent/Dockerfile.template b/tools/kubent/Dockerfile.template
index 34a53ec10d..9e1a0a7fb1 100644
--- a/tools/kubent/Dockerfile.template
+++ b/tools/kubent/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/kubernetes-json-schema/Dockerfile.template b/tools/kubernetes-json-schema/Dockerfile.template
index a85e5c29f9..7a564b5fa3 100644
--- a/tools/kubernetes-json-schema/Dockerfile.template
+++ b/tools/kubernetes-json-schema/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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/kubescape/Dockerfile.template b/tools/kubescape/Dockerfile.template
index 361a86d231..9f6cf97db2 100644
--- a/tools/kubescape/Dockerfile.template
+++ b/tools/kubescape/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/kubeseal/Dockerfile.template b/tools/kubeseal/Dockerfile.template
index 33cf94c3b0..ecb510b693 100644
--- a/tools/kubeseal/Dockerfile.template
+++ b/tools/kubeseal/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/kubesec/Dockerfile.template b/tools/kubesec/Dockerfile.template
index 4a3548d2a2..66b7a36855 100644
--- a/tools/kubesec/Dockerfile.template
+++ b/tools/kubesec/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/kubeshark/Dockerfile.template b/tools/kubeshark/Dockerfile.template
index d99d289b87..c9845116fe 100644
--- a/tools/kubeshark/Dockerfile.template
+++ b/tools/kubeshark/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/kubeswitch/Dockerfile.template b/tools/kubeswitch/Dockerfile.template
index 784acb07b0..e2cd9c9339 100644
--- a/tools/kubeswitch/Dockerfile.template
+++ b/tools/kubeswitch/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/kubeval/Dockerfile.template b/tools/kubeval/Dockerfile.template
index f40bb723a1..572f8040ff 100644
--- a/tools/kubeval/Dockerfile.template
+++ b/tools/kubeval/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/kubo/Dockerfile.template b/tools/kubo/Dockerfile.template
index bad0d5490d..2f3e5493d8 100644
--- a/tools/kubo/Dockerfile.template
+++ b/tools/kubo/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
 
diff --git a/tools/kudo/Dockerfile.template b/tools/kudo/Dockerfile.template
index f9fde76c57..c682d8b015 100644
--- a/tools/kudo/Dockerfile.template
+++ b/tools/kudo/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/kustomize/Dockerfile.template b/tools/kustomize/Dockerfile.template
index 45d8545d96..8ae257c578 100644
--- a/tools/kustomize/Dockerfile.template
+++ b/tools/kustomize/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/kustomizer/Dockerfile.template b/tools/kustomizer/Dockerfile.template
index 58f2ff8f7d..6647fc56c2 100644
--- a/tools/kustomizer/Dockerfile.template
+++ b/tools/kustomizer/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/kuttl/Dockerfile.template b/tools/kuttl/Dockerfile.template
index da4ef1c07d..145d88c258 100644
--- a/tools/kuttl/Dockerfile.template
+++ b/tools/kuttl/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/kwok/Dockerfile.template b/tools/kwok/Dockerfile.template
index 09a3f93842..014a74c794 100644
--- a/tools/kwok/Dockerfile.template
+++ b/tools/kwok/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/kyverno/Dockerfile.template b/tools/kyverno/Dockerfile.template
index 23a9ce0c4b..9da9c9e9d2 100644
--- a/tools/kyverno/Dockerfile.template
+++ b/tools/kyverno/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 b5e14fd42cfc26088e30a6fccfe339115e40122d Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 15:39:23 +0100
Subject: [PATCH 2/4] Removed target var #2213

---
 tools/k0s/Dockerfile.template                  | 10 +++++-----
 tools/k0sctl/Dockerfile.template               | 10 +++++-----
 tools/k2d/Dockerfile.template                  |  2 +-
 tools/k3d/Dockerfile.template                  | 10 +++++-----
 tools/k3s/Dockerfile.template                  | 10 +++++-----
 tools/k3sup/Dockerfile.template                | 10 +++++-----
 tools/k6/Dockerfile.template                   |  8 ++++----
 tools/k8s-tew/Dockerfile.template              |  8 ++++----
 tools/k8spacket/Dockerfile.template            |  2 +-
 tools/k9s/Dockerfile.template                  |  8 ++++----
 tools/kapp/Dockerfile.template                 | 10 +++++-----
 tools/katana/Dockerfile.template               |  2 +-
 tools/kbld/Dockerfile.template                 |  4 ++--
 tools/kbom/Dockerfile.template                 |  8 ++++----
 tools/kbrew/Dockerfile.template                |  8 ++++----
 tools/kcount/Dockerfile.template               |  2 +-
 tools/kcp/Dockerfile.template                  | 10 +++++-----
 tools/kd/Dockerfile.template                   | 10 +++++-----
 tools/kdo/Dockerfile.template                  |  2 +-
 tools/ketch/Dockerfile.template                |  4 ++--
 tools/kexp/Dockerfile.template                 |  2 +-
 tools/keybase/Dockerfile.template              |  2 +-
 tools/keyoxide/Dockerfile.template             |  4 ++--
 tools/kgctl/Dockerfile.template                |  4 ++--
 tools/kind/Dockerfile.template                 | 10 +++++-----
 tools/kink/Dockerfile.template                 |  8 ++++----
 tools/kitt/Dockerfile.template                 |  8 ++++----
 tools/kitty/Dockerfile.template                |  2 +-
 tools/kluctl/Dockerfile.template               |  8 ++++----
 tools/kmon/Dockerfile.template                 | 10 +++++-----
 tools/kn/Dockerfile.template                   |  8 ++++----
 tools/kompose/Dockerfile.template              | 10 +++++-----
 tools/konf/Dockerfile.template                 |  8 ++++----
 tools/kots/Dockerfile.template                 | 10 +++++-----
 tools/kp/Dockerfile.template                   | 10 +++++-----
 tools/kpt/Dockerfile.template                  |  8 ++++----
 tools/krew/Dockerfile.template                 |  4 ++--
 tools/ksort/Dockerfile.template                |  2 +-
 tools/ktop/Dockerfile.template                 |  2 +-
 tools/ktunnel/Dockerfile.template              |  2 +-
 tools/kube-apiserver/Dockerfile.template       |  6 +++---
 tools/kube-bench/Dockerfile.template           | 10 +++++-----
 .../Dockerfile.template                        |  6 +++---
 tools/kube-linter/Dockerfile.template          | 10 +++++-----
 tools/kube-proxy/Dockerfile.template           |  6 +++---
 tools/kube-psp-advisor/Dockerfile.template     |  2 +-
 tools/kube-scheduler/Dockerfile.template       |  6 +++---
 tools/kube-score/Dockerfile.template           |  4 ++--
 tools/kubeadm/Dockerfile.template              | 12 ++++++------
 tools/kubeaudit/Dockerfile.template            |  8 ++++----
 tools/kubebox/Dockerfile.template              |  4 ++--
 tools/kubeclarity-cli/Dockerfile.template      |  8 ++++----
 tools/kubecolor/Dockerfile.template            |  2 +-
 tools/kubeconform/Dockerfile.template          |  2 +-
 tools/kubectl-aliases/Dockerfile.template      |  2 +-
 tools/kubectl-build/Dockerfile.template        |  2 +-
 tools/kubectl-free/Dockerfile.template         |  2 +-
 tools/kubectl-plugins/Dockerfile.template      | 12 ++++++------
 tools/kubectl-resources/Dockerfile.template    |  2 +-
 tools/kubectl-ssh-proxy/Dockerfile.template    |  6 +++---
 tools/kubectl/Dockerfile.template              | 18 +++++++++---------
 tools/kubefire/Dockerfile.template             | 10 +++++-----
 tools/kubelet/Dockerfile.template              |  8 ++++----
 tools/kubeletctl/Dockerfile.template           |  4 ++--
 tools/kubent/Dockerfile.template               |  2 +-
 .../kubernetes-json-schema/Dockerfile.template |  6 +++---
 tools/kubescape/Dockerfile.template            |  8 ++++----
 tools/kubeseal/Dockerfile.template             |  2 +-
 tools/kubesec/Dockerfile.template              |  8 ++++----
 tools/kubeshark/Dockerfile.template            | 10 +++++-----
 tools/kubeswitch/Dockerfile.template           |  2 +-
 tools/kubeval/Dockerfile.template              |  2 +-
 tools/kubo/Dockerfile.template                 | 14 +++++++-------
 tools/kudo/Dockerfile.template                 |  2 +-
 tools/kustomize/Dockerfile.template            |  8 ++++----
 tools/kustomizer/Dockerfile.template           |  8 ++++----
 tools/kuttl/Dockerfile.template                |  8 ++++----
 tools/kwok/Dockerfile.template                 | 14 +++++++-------
 tools/kyverno/Dockerfile.template              |  8 ++++----
 79 files changed, 257 insertions(+), 257 deletions(-)

diff --git a/tools/k0s/Dockerfile.template b/tools/k0s/Dockerfile.template
index fb643318cc..2ca0fcf147 100644
--- a/tools/k0s/Dockerfile.template
+++ b/tools/k0s/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "k0sproject/k0s" "v${version}" "k0s-v${version}-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k0s" \
+curl --silent --location --fail --output "${prefix}/bin/k0s" \
     "https://github.com/k0sproject/k0s/releases/download/v${version}/k0s-v${version}-${alt_arch}"
-chmod +x "${prefix}${target}/bin/k0s"
+chmod +x "${prefix}/bin/k0s"
 
-"${prefix}${target}/bin/k0s" completion bash >"${prefix}${target}/share/bash-completion/completions/k0s"
-"${prefix}${target}/bin/k0s" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k0s.fish"
-"${prefix}${target}/bin/k0s" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k0s"
+"${prefix}/bin/k0s" completion bash >"${prefix}/share/bash-completion/completions/k0s"
+"${prefix}/bin/k0s" completion fish >"${prefix}/share/fish/vendor_completions.d/k0s.fish"
+"${prefix}/bin/k0s" completion zsh >"${prefix}/share/zsh/vendor-completions/_k0s"
 EOF
\ No newline at end of file
diff --git a/tools/k0sctl/Dockerfile.template b/tools/k0sctl/Dockerfile.template
index 1d9fb8ab09..ce1d40152a 100644
--- a/tools/k0sctl/Dockerfile.template
+++ b/tools/k0sctl/Dockerfile.template
@@ -23,11 +23,11 @@ case "${arch}" in
 esac
 echo "    Using ${arch_suffix}"
 check-github-release-asset "k0sproject/k0sctl" "v${version}" "k0sctl-linux-${arch_suffix}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k0sctl" \
+curl --silent --location --fail --output "${prefix}/bin/k0sctl" \
     "https://github.com/k0sproject/k0sctl/releases/download/v${version}/k0sctl-linux-${arch_suffix}"
-chmod +x "${prefix}${target}/bin/k0sctl"
+chmod +x "${prefix}/bin/k0sctl"
 
-"${prefix}${target}/bin/k0sctl" completion bash >"${prefix}${target}/share/bash-completion/completions/k0sctl"
-"${prefix}${target}/bin/k0sctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k0sctl.fish"
-"${prefix}${target}/bin/k0sctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k0sctl"
+"${prefix}/bin/k0sctl" completion bash >"${prefix}/share/bash-completion/completions/k0sctl"
+"${prefix}/bin/k0sctl" completion fish >"${prefix}/share/fish/vendor_completions.d/k0sctl.fish"
+"${prefix}/bin/k0sctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_k0sctl"
 EOF
\ No newline at end of file
diff --git a/tools/k2d/Dockerfile.template b/tools/k2d/Dockerfile.template
index d1e06511e9..821e69b0e8 100644
--- a/tools/k2d/Dockerfile.template
+++ b/tools/k2d/Dockerfile.template
@@ -16,5 +16,5 @@ ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/portainer/k2d .
 make release
-cp dist/k2d "${prefix}${target}/bin/"
+cp dist/k2d "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/k3d/Dockerfile.template b/tools/k3d/Dockerfile.template
index 6fffef4a57..0e624b84d6 100644
--- a/tools/k3d/Dockerfile.template
+++ b/tools/k3d/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "rancher/k3d" "v${version}" "k3d-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k3d" \
+curl --silent --location --fail --output "${prefix}/bin/k3d" \
     "https://github.com/rancher/k3d/releases/download/v${version}/k3d-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/k3d"
-"${prefix}${target}/bin/k3d" completion bash >"${prefix}${target}/share/bash-completion/completions/k3d"
-"${prefix}${target}/bin/k3d" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k3d.fish"
-"${prefix}${target}/bin/k3d" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k3d"
+chmod +x "${prefix}/bin/k3d"
+"${prefix}/bin/k3d" completion bash >"${prefix}/share/bash-completion/completions/k3d"
+"${prefix}/bin/k3d" completion fish >"${prefix}/share/fish/vendor_completions.d/k3d.fish"
+"${prefix}/bin/k3d" completion zsh >"${prefix}/share/zsh/vendor-completions/_k3d"
 EOF
diff --git a/tools/k3s/Dockerfile.template b/tools/k3s/Dockerfile.template
index cb9f63520b..8903f75ac4 100644
--- a/tools/k3s/Dockerfile.template
+++ b/tools/k3s/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY k3s.service ${prefix}${target}/etc/systemd/system/
+COPY k3s.service ${prefix}/etc/systemd/system/
 RUN <<EOF
 echo "### Setting architecture string for ${TARGETPLATFORM}"
 case "${arch}" in
@@ -27,9 +27,9 @@ echo "    Using ${arch_suffix}"
 check-github-release-asset "k3s-io/k3s" "v${version}" "k3s${arch_suffix}"
 
 echo "### Downloading ${name} ${version}"
-curl --silent --location --fail --output "${prefix}${target}/bin/k3s" \
+curl --silent --location --fail --output "${prefix}/bin/k3s" \
     "https://github.com/k3s-io/k3s/releases/download/v${version}/k3s${arch_suffix}"
-chmod +x "${prefix}${target}/bin/k3s"
-"${prefix}${target}/bin/k3s" completion bash >"${prefix}${target}/share/bash-completion/completions/k3s"
-"${prefix}${target}/bin/k3s" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k3s"
+chmod +x "${prefix}/bin/k3s"
+"${prefix}/bin/k3s" completion bash >"${prefix}/share/bash-completion/completions/k3s"
+"${prefix}/bin/k3s" completion zsh >"${prefix}/share/zsh/vendor-completions/_k3s"
 EOF
\ No newline at end of file
diff --git a/tools/k3sup/Dockerfile.template b/tools/k3sup/Dockerfile.template
index c567fb4644..129c22bfd7 100644
--- a/tools/k3sup/Dockerfile.template
+++ b/tools/k3sup/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "alexellis/k3sup" "${version}" "k3sup"
-curl --silent --location --fail --output "${prefix}${target}/bin/k3sup" \
+curl --silent --location --fail --output "${prefix}/bin/k3sup" \
     "https://github.com/alexellis/k3sup/releases/download/${version}/k3sup"
-chmod +x "${prefix}${target}/bin/k3sup"
-"${prefix}${target}/bin/k3sup" completion bash >"${prefix}${target}/share/bash-completion/completions/k3sup"
-"${prefix}${target}/bin/k3sup" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k3sup.fish"
-"${prefix}${target}/bin/k3sup" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k3sup"
+chmod +x "${prefix}/bin/k3sup"
+"${prefix}/bin/k3sup" completion bash >"${prefix}/share/bash-completion/completions/k3sup"
+"${prefix}/bin/k3sup" completion fish >"${prefix}/share/fish/vendor_completions.d/k3sup.fish"
+"${prefix}/bin/k3sup" completion zsh >"${prefix}/share/zsh/vendor-completions/_k3sup"
 EOF
\ No newline at end of file
diff --git a/tools/k6/Dockerfile.template b/tools/k6/Dockerfile.template
index e737bad672..fa9dc61c5e 100644
--- a/tools/k6/Dockerfile.template
+++ b/tools/k6/Dockerfile.template
@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "grafana/k6" "v${version}" "k6-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/grafana/k6/releases/download/v${version}/k6-v${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner
-"${prefix}${target}/bin/k6" completion bash >"${prefix}${target}/share/bash-completion/completions/k6"
-"${prefix}${target}/bin/k6" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k6.fish"
-"${prefix}${target}/bin/k6" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k6"
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner
+"${prefix}/bin/k6" completion bash >"${prefix}/share/bash-completion/completions/k6"
+"${prefix}/bin/k6" completion fish >"${prefix}/share/fish/vendor_completions.d/k6.fish"
+"${prefix}/bin/k6" completion zsh >"${prefix}/share/zsh/vendor-completions/_k6"
 EOF
\ No newline at end of file
diff --git a/tools/k8s-tew/Dockerfile.template b/tools/k8s-tew/Dockerfile.template
index 156999f5c5..ee68f0aaff 100644
--- a/tools/k8s-tew/Dockerfile.template
+++ b/tools/k8s-tew/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "darxkies/k8s-tew" "${version}" "k8s-tew"
-curl --silent --location --fail --output "${prefix}${target}/bin/k8s-tew" \
+curl --silent --location --fail --output "${prefix}/bin/k8s-tew" \
     "https://github.com/darxkies/k8s-tew/releases/download/${version}/k8s-tew"
-chmod +x "${prefix}${target}/bin/k8s-tew"
+chmod +x "${prefix}/bin/k8s-tew"
 
-"${prefix}${target}/bin/k8s-tew" completion bash >"${prefix}${target}/share/bash-completion/completions/k8s-tew"
-"${prefix}${target}/bin/k8s-tew" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k8s-tew"
+"${prefix}/bin/k8s-tew" completion bash >"${prefix}/share/bash-completion/completions/k8s-tew"
+"${prefix}/bin/k8s-tew" completion zsh >"${prefix}/share/zsh/vendor-completions/_k8s-tew"
 EOF
\ No newline at end of file
diff --git a/tools/k8spacket/Dockerfile.template b/tools/k8spacket/Dockerfile.template
index 072697305e..3d9666c602 100644
--- a/tools/k8spacket/Dockerfile.template
+++ b/tools/k8spacket/Dockerfile.template
@@ -25,4 +25,4 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=build /usr/local/bin/k8spacket ${prefix}${target}/bin/
+COPY --from=build /usr/local/bin/k8spacket ${prefix}/bin/
diff --git a/tools/k9s/Dockerfile.template b/tools/k9s/Dockerfile.template
index f4f3162d68..667a36f380 100644
--- a/tools/k9s/Dockerfile.template
+++ b/tools/k9s/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "derailed/k9s" "v${version}" "k9s_Linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/derailed/k9s/releases/download/v${version}/k9s_Linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     k9s
-"${prefix}${target}/bin/k9s" completion bash >"${prefix}${target}/share/bash-completion/completions/k9s"
-"${prefix}${target}/bin/k9s" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/k9s.fish"
-"${prefix}${target}/bin/k9s" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_k9s"
+"${prefix}/bin/k9s" completion bash >"${prefix}/share/bash-completion/completions/k9s"
+"${prefix}/bin/k9s" completion fish >"${prefix}/share/fish/vendor_completions.d/k9s.fish"
+"${prefix}/bin/k9s" completion zsh >"${prefix}/share/zsh/vendor-completions/_k9s"
 EOF
\ No newline at end of file
diff --git a/tools/kapp/Dockerfile.template b/tools/kapp/Dockerfile.template
index ab997cfdec..359837c5e2 100644
--- a/tools/kapp/Dockerfile.template
+++ b/tools/kapp/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "carvel-dev/kapp" "v${version}" "kapp-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kapp" \
+curl --silent --location --fail --output "${prefix}/bin/kapp" \
     "https://github.com/carvel-dev/kapp/releases/download/v${version}/kapp-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kapp"
-"${prefix}${target}/bin/kapp" completion bash >"${prefix}${target}/share/bash-completion/completions/kapp"
-"${prefix}${target}/bin/kapp" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kapp.fish"
-"${prefix}${target}/bin/kapp" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kapp"
+chmod +x "${prefix}/bin/kapp"
+"${prefix}/bin/kapp" completion bash >"${prefix}/share/bash-completion/completions/kapp"
+"${prefix}/bin/kapp" completion fish >"${prefix}/share/fish/vendor_completions.d/kapp.fish"
+"${prefix}/bin/kapp" completion zsh >"${prefix}/share/zsh/vendor-completions/_kapp"
 EOF
\ No newline at end of file
diff --git a/tools/katana/Dockerfile.template b/tools/katana/Dockerfile.template
index babf8f002e..06b8ddc1f7 100644
--- a/tools/katana/Dockerfile.template
+++ b/tools/katana/Dockerfile.template
@@ -12,6 +12,6 @@ check-github-release-asset "projectdiscovery/katana" "v${version}" "katana_${ver
 url="https://github.com/projectdiscovery/katana/releases/download/v${version}/katana_${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}" \
     katana
 EOF
\ No newline at end of file
diff --git a/tools/kbld/Dockerfile.template b/tools/kbld/Dockerfile.template
index 68cd2d36ce..76393da177 100644
--- a/tools/kbld/Dockerfile.template
+++ b/tools/kbld/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "carvel-dev/kbld" "v${version}" "kbld-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kbld" \
+curl --silent --location --fail --output "${prefix}/bin/kbld" \
     "https://github.com/carvel-dev/kbld/releases/download/v${version}/kbld-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kbld"
+chmod +x "${prefix}/bin/kbld"
 EOF
\ No newline at end of file
diff --git a/tools/kbom/Dockerfile.template b/tools/kbom/Dockerfile.template
index 442821a0d2..b373ea19a4 100644
--- a/tools/kbom/Dockerfile.template
+++ b/tools/kbom/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "ksoclabs/kbom" "v${version}" "kbom_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ksoclabs/kbom/releases/download/v${version}/kbom_${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 \
     kbom
     
-"${prefix}${target}/bin/kbom" completion bash >"${prefix}${target}/share/bash-completion/completions/kbom"
-"${prefix}${target}/bin/kbom" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kbom.fish"
-"${prefix}${target}/bin/kbom" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kbom"
+"${prefix}/bin/kbom" completion bash >"${prefix}/share/bash-completion/completions/kbom"
+"${prefix}/bin/kbom" completion fish >"${prefix}/share/fish/vendor_completions.d/kbom.fish"
+"${prefix}/bin/kbom" completion zsh >"${prefix}/share/zsh/vendor-completions/_kbom"
 EOF
\ No newline at end of file
diff --git a/tools/kbrew/Dockerfile.template b/tools/kbrew/Dockerfile.template
index d6a2bbacb7..4d6b94faa1 100644
--- a/tools/kbrew/Dockerfile.template
+++ b/tools/kbrew/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kbrew-dev/kbrew" "v${version}" "kbrew_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kbrew-dev/kbrew/releases/download/v${version}/kbrew_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kbrew
-"${prefix}${target}/bin/kbrew" completion bash >"${prefix}${target}/share/bash-completion/completions/kbrew"
-"${prefix}${target}/bin/kbrew" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kbrew.fish"
-"${prefix}${target}/bin/kbrew" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kbrew"
+"${prefix}/bin/kbrew" completion bash >"${prefix}/share/bash-completion/completions/kbrew"
+"${prefix}/bin/kbrew" completion fish >"${prefix}/share/fish/vendor_completions.d/kbrew.fish"
+"${prefix}/bin/kbrew" completion zsh >"${prefix}/share/zsh/vendor-completions/_kbrew"
 EOF
\ No newline at end of file
diff --git a/tools/kcount/Dockerfile.template b/tools/kcount/Dockerfile.template
index a01e4c106d..a1f1c177e0 100644
--- a/tools/kcount/Dockerfile.template
+++ b/tools/kcount/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "pan-net-security/kcount" "v${version}" "kcount_${version}_Linux_x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/pan-net-security/kcount/releases/download/v${version}/kcount_${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 \
     kcount
 EOF
\ No newline at end of file
diff --git a/tools/kcp/Dockerfile.template b/tools/kcp/Dockerfile.template
index 66cdb70039..4d524d3073 100644
--- a/tools/kcp/Dockerfile.template
+++ b/tools/kcp/Dockerfile.template
@@ -11,14 +11,14 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kcp-dev/kcp" "v${version}" "kcp_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kcp-dev/kcp/releases/download/v${version}/kcp_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     bin/kcp
 EOF
 
 RUN <<EOF
 check-github-release-asset "kcp-dev/kcp" "v${version}" "kubectl-kcp-plugin_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kcp-dev/kcp/releases/download/v${version}/kubectl-kcp-plugin_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     bin/kubectl-kcp \
     bin/kubectl-workspace \
     bin/kubectl-workspaces \
@@ -28,8 +28,8 @@ EOF
 RUN <<EOF
 for binary_name in kcp kubectl-kcp kubectl-ws kubectl-workspaces; do
     echo "Install completion for ${binary_name}"
-    "${prefix}${target}/bin/${binary_name}" completion bash >"${prefix}${target}/share/bash-completion/completions/${binary_name}"
-    "${prefix}${target}/bin/${binary_name}" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/${binary_name}.fish"
-    "${prefix}${target}/bin/${binary_name}" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_${binary_name}"
+    "${prefix}/bin/${binary_name}" completion bash >"${prefix}/share/bash-completion/completions/${binary_name}"
+    "${prefix}/bin/${binary_name}" completion fish >"${prefix}/share/fish/vendor_completions.d/${binary_name}.fish"
+    "${prefix}/bin/${binary_name}" completion zsh >"${prefix}/share/zsh/vendor-completions/_${binary_name}"
 done
 EOF
\ No newline at end of file
diff --git a/tools/kd/Dockerfile.template b/tools/kd/Dockerfile.template
index 38fed56852..542db1078d 100644
--- a/tools/kd/Dockerfile.template
+++ b/tools/kd/Dockerfile.template
@@ -9,14 +9,14 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "UKHomeOffice/kd" "v${version}" "kd_linux_amd64"
-curl --silent --location --fail --output "${prefix}${target}/bin/kd" \
+curl --silent --location --fail --output "${prefix}/bin/kd" \
     "https://github.com/UKHomeOffice/kd/releases/download/v${version}/kd_linux_amd64"
-chmod +x "${prefix}${target}/bin/kd"
+chmod +x "${prefix}/bin/kd"
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/kd" completion bash >"${prefix}${target}/share/bash-completion/completions/kd"
-#"${prefix}${target}/bin/kd" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kd.fish"
-#"${prefix}${target}/bin/kd" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kd"
+#"${prefix}/bin/kd" completion bash >"${prefix}/share/bash-completion/completions/kd"
+#"${prefix}/bin/kd" completion fish >"${prefix}/share/fish/vendor_completions.d/kd.fish"
+#"${prefix}/bin/kd" completion zsh >"${prefix}/share/zsh/vendor-completions/_kd"
 #EOF
\ No newline at end of file
diff --git a/tools/kdo/Dockerfile.template b/tools/kdo/Dockerfile.template
index e417558866..f99e534d85 100644
--- a/tools/kdo/Dockerfile.template
+++ b/tools/kdo/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "stepro/kdo" "v${version}" "kdo-v${version}-linux-amd64.tar.gz"
 curl --silent --location --fail "https://github.com/stepro/kdo/releases/download/v${version}/kdo-v${version}-linux-amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/ketch/Dockerfile.template b/tools/ketch/Dockerfile.template
index e9bf3c25ec..0e1b52c5db 100644
--- a/tools/ketch/Dockerfile.template
+++ b/tools/ketch/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "theketchio/ketch" "v${version}" "ketch-linux-amd64"
-curl --silent --location --fail --output "${prefix}${target}/bin/ketch" \
+curl --silent --location --fail --output "${prefix}/bin/ketch" \
     "https://github.com/theketchio/ketch/releases/download/v${version}/ketch-linux-amd64"
-chmod +x "${prefix}${target}/bin/ketch"
+chmod +x "${prefix}/bin/ketch"
 EOF
\ No newline at end of file
diff --git a/tools/kexp/Dockerfile.template b/tools/kexp/Dockerfile.template
index b5948c6f20..4c30f33b93 100644
--- a/tools/kexp/Dockerfile.template
+++ b/tools/kexp/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "iximiuz/kexp" "v${version}" "kexp_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/iximiuz/kexp/releases/download/v${version}/kexp_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     kexp
 EOF
diff --git a/tools/keybase/Dockerfile.template b/tools/keybase/Dockerfile.template
index d3fefcb57e..5c448dc61a 100644
--- a/tools/keybase/Dockerfile.template
+++ b/tools/keybase/Dockerfile.template
@@ -22,5 +22,5 @@ ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/keybase/client .
 cd go
-go build -tags production -o "${prefix}${target}/bin/keybase" github.com/keybase/client/go/keybase
+go build -tags production -o "${prefix}/bin/keybase" github.com/keybase/client/go/keybase
 EOF
diff --git a/tools/keyoxide/Dockerfile.template b/tools/keyoxide/Dockerfile.template
index e7b78269b1..1a05d8f866 100644
--- a/tools/keyoxide/Dockerfile.template
+++ b/tools/keyoxide/Dockerfile.template
@@ -10,12 +10,12 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
-WORKDIR ${prefix}${target}/libexec/keyoxide
+WORKDIR ${prefix}/libexec/keyoxide
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "keyoxide@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/keyoxide/node_modules/.bin/keyoxide" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/keyoxide/node_modules/.bin/keyoxide" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/kgctl/Dockerfile.template b/tools/kgctl/Dockerfile.template
index 6c1139386e..be252d408b 100644
--- a/tools/kgctl/Dockerfile.template
+++ b/tools/kgctl/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "squat/kilo" "${version}" "kgctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kgctl" \
+curl --silent --location --fail --output "${prefix}/bin/kgctl" \
     "https://github.com/squat/kilo/releases/download/${version}/kgctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kgctl"
+chmod +x "${prefix}/bin/kgctl"
 EOF
\ No newline at end of file
diff --git a/tools/kind/Dockerfile.template b/tools/kind/Dockerfile.template
index 56ad511035..ffdc5cfbda 100644
--- a/tools/kind/Dockerfile.template
+++ b/tools/kind/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/kind" "v${version}" "kind-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kind" \
+curl --silent --location --fail --output "${prefix}/bin/kind" \
     "https://github.com/kubernetes-sigs/kind/releases/download/v${version}/kind-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kind"
-"${prefix}${target}/bin/kind" completion bash >"${prefix}${target}/share/bash-completion/completions/kind"
-"${prefix}${target}/bin/kind" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kind.fish"
-"${prefix}${target}/bin/kind" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kind"
+chmod +x "${prefix}/bin/kind"
+"${prefix}/bin/kind" completion bash >"${prefix}/share/bash-completion/completions/kind"
+"${prefix}/bin/kind" completion fish >"${prefix}/share/fish/vendor_completions.d/kind.fish"
+"${prefix}/bin/kind" completion zsh >"${prefix}/share/zsh/vendor-completions/_kind"
 EOF
\ No newline at end of file
diff --git a/tools/kink/Dockerfile.template b/tools/kink/Dockerfile.template
index 16276b3975..96538cf323 100644
--- a/tools/kink/Dockerfile.template
+++ b/tools/kink/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "Trendyol/kink" "v${version}" "kink_${version}_Linux-${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/Trendyol/kink/releases/download/v${version}/kink_${version}_Linux-${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kink
-"${prefix}${target}/bin/kink" completion bash >"${prefix}${target}/share/bash-completion/completions/kink"
-"${prefix}${target}/bin/kink" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kink.fish"
-"${prefix}${target}/bin/kink" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kink"
+"${prefix}/bin/kink" completion bash >"${prefix}/share/bash-completion/completions/kink"
+"${prefix}/bin/kink" completion fish >"${prefix}/share/fish/vendor_completions.d/kink.fish"
+"${prefix}/bin/kink" completion zsh >"${prefix}/share/zsh/vendor-completions/_kink"
 EOF
\ No newline at end of file
diff --git a/tools/kitt/Dockerfile.template b/tools/kitt/Dockerfile.template
index b6b324699b..cfc5596aeb 100644
--- a/tools/kitt/Dockerfile.template
+++ b/tools/kitt/Dockerfile.template
@@ -20,9 +20,9 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/kitt" --console-script kitt "kitt-shell==${version}" cryptography
+shiv --output-file "${prefix}/bin/kitt" --console-script kitt "kitt-shell==${version}" cryptography
 
-#"${prefix}${target}/bin/kitt" completion bash >"${prefix}${target}/share/bash-completion/completions/kitt"
-#"${prefix}${target}/bin/kitt" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kitt.fish"
-#"${prefix}${target}/bin/kitt" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kitt"
+#"${prefix}/bin/kitt" completion bash >"${prefix}/share/bash-completion/completions/kitt"
+#"${prefix}/bin/kitt" completion fish >"${prefix}/share/fish/vendor_completions.d/kitt.fish"
+#"${prefix}/bin/kitt" completion zsh >"${prefix}/share/zsh/vendor-completions/_kitt"
 EOF
diff --git a/tools/kitty/Dockerfile.template b/tools/kitty/Dockerfile.template
index 0b34fe9ef7..01c39e7e6b 100644
--- a/tools/kitty/Dockerfile.template
+++ b/tools/kitty/Dockerfile.template
@@ -25,5 +25,5 @@ echo "    Using ${arch_suffix}"
 
 check-github-release-asset "kovidgoyal/kitty" "v${version}" "kitty-${version}-${arch_suffix}.txz"
 curl --silent --location --fail "https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}-${arch_suffix}.txz" \
-| tar --extract --xz --directory="${prefix}${target}/" --no-same-owner
+| tar --extract --xz --directory="${prefix}/" --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/kluctl/Dockerfile.template b/tools/kluctl/Dockerfile.template
index b7ea48385f..86ff4527b6 100644
--- a/tools/kluctl/Dockerfile.template
+++ b/tools/kluctl/Dockerfile.template
@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kluctl/kluctl" "v${version}" "kluctl_v${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kluctl/kluctl/releases/download/v${version}/kluctl_v${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
-"${prefix}${target}/bin/kluctl" completion bash >"${prefix}${target}/share/bash-completion/completions/kluctl"
-"${prefix}${target}/bin/kluctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kluctl.fish"
-"${prefix}${target}/bin/kluctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kluctl"
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
+"${prefix}/bin/kluctl" completion bash >"${prefix}/share/bash-completion/completions/kluctl"
+"${prefix}/bin/kluctl" completion fish >"${prefix}/share/fish/vendor_completions.d/kluctl.fish"
+"${prefix}/bin/kluctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_kluctl"
 EOF
\ No newline at end of file
diff --git a/tools/kmon/Dockerfile.template b/tools/kmon/Dockerfile.template
index 766ac4ad6a..57a583be63 100644
--- a/tools/kmon/Dockerfile.template
+++ b/tools/kmon/Dockerfile.template
@@ -12,9 +12,9 @@ check-github-release-asset "orhun/kmon" "v${version}" "kmon-${version}-x86_64-un
 curl --silent --location --fail "https://github.com/orhun/kmon/releases/download/v${version}/kmon-${version}-x86_64-unknown-linux-gnu.tar.gz" \
 | tar --extract --gzip --directory="/tmp" --no-same-owner
 find /tmp
-mv "/tmp/kmon-${version}/kmon" "${prefix}${target}/bin/"
-mv "/tmp/kmon-${version}/man/kmon.8" "${prefix}${target}/share/man/man8/"
-mv "/tmp/kmon-${version}/completions/kmon.bash" "${prefix}${target}/share/bash-completion/completions/kmon"
-mv "/tmp/kmon-${version}/completions/kmon.fish" "${prefix}${target}/share/fish/vendor_completions.d/kmon.fish"
-mv "/tmp/kmon-${version}/completions/_kmon" "${prefix}${target}/share/zsh/vendor-completions/_kmon"
+mv "/tmp/kmon-${version}/kmon" "${prefix}/bin/"
+mv "/tmp/kmon-${version}/man/kmon.8" "${prefix}/share/man/man8/"
+mv "/tmp/kmon-${version}/completions/kmon.bash" "${prefix}/share/bash-completion/completions/kmon"
+mv "/tmp/kmon-${version}/completions/kmon.fish" "${prefix}/share/fish/vendor_completions.d/kmon.fish"
+mv "/tmp/kmon-${version}/completions/_kmon" "${prefix}/share/zsh/vendor-completions/_kmon"
 EOF
\ No newline at end of file
diff --git a/tools/kn/Dockerfile.template b/tools/kn/Dockerfile.template
index 376c59ab44..5488a14487 100644
--- a/tools/kn/Dockerfile.template
+++ b/tools/kn/Dockerfile.template
@@ -9,9 +9,9 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "knative/client" "knative-v${version}" "kn-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kn" \
+curl --silent --location --fail --output "${prefix}/bin/kn" \
     "https://github.com/knative/client/releases/download/knative-v${version}/kn-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kn"
-"${prefix}${target}/bin/kn" completion bash >"${prefix}${target}/share/bash-completion/completions/kn"
-"${prefix}${target}/bin/kn" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kn"
+chmod +x "${prefix}/bin/kn"
+"${prefix}/bin/kn" completion bash >"${prefix}/share/bash-completion/completions/kn"
+"${prefix}/bin/kn" completion zsh >"${prefix}/share/zsh/vendor-completions/_kn"
 EOF
\ No newline at end of file
diff --git a/tools/kompose/Dockerfile.template b/tools/kompose/Dockerfile.template
index 0a9ae8cba2..a623a551fb 100644
--- a/tools/kompose/Dockerfile.template
+++ b/tools/kompose/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes/kompose" "v${version}" "kompose-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kompose" \
+curl --silent --location --fail --output "${prefix}/bin/kompose" \
     "https://github.com/kubernetes/kompose/releases/download/v${version}/kompose-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kompose"
-"${prefix}${target}/bin/kompose" completion bash >"${prefix}${target}/share/bash-completion/completions/kompose"
-"${prefix}${target}/bin/kompose" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kompose.fish"
-"${prefix}${target}/bin/kompose" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kompose"
+chmod +x "${prefix}/bin/kompose"
+"${prefix}/bin/kompose" completion bash >"${prefix}/share/bash-completion/completions/kompose"
+"${prefix}/bin/kompose" completion fish >"${prefix}/share/fish/vendor_completions.d/kompose.fish"
+"${prefix}/bin/kompose" completion zsh >"${prefix}/share/zsh/vendor-completions/_kompose"
 EOF
\ No newline at end of file
diff --git a/tools/konf/Dockerfile.template b/tools/konf/Dockerfile.template
index 5c1384cf90..508b28b055 100644
--- a/tools/konf/Dockerfile.template
+++ b/tools/konf/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY <<EOF ${prefix}${target}/etc/profile.d/konf.sh
+COPY <<EOF ${prefix}/etc/profile.d/konf.sh
 case "\$(basename "\${SHELL}")" in
     bash)
         source <(konf-go shellwrapper bash)
@@ -20,8 +20,8 @@ EOF
 RUN <<EOF
 check-github-release-asset "SimonTheLeg/konf-go" "v${version}" "konf-go_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/SimonTheLeg/konf-go/releases/download/v${version}/konf-go_${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 \
     konf-go
-"${prefix}${target}/bin/konf-go" completion bash >"${prefix}${target}/share/bash-completion/completions/konf"
-"${prefix}${target}/bin/konf-go" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_konf"
+"${prefix}/bin/konf-go" completion bash >"${prefix}/share/bash-completion/completions/konf"
+"${prefix}/bin/konf-go" completion zsh >"${prefix}/share/zsh/vendor-completions/_konf"
 EOF
\ No newline at end of file
diff --git a/tools/kots/Dockerfile.template b/tools/kots/Dockerfile.template
index 2af420f6cb..709b12bf30 100644
--- a/tools/kots/Dockerfile.template
+++ b/tools/kots/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "replicatedhq/kots" "v${version}" "kots_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/replicatedhq/kots/releases/download/v${version}/kots_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kots
-mv "${prefix}${target}/bin/kots" "${prefix}${target}/bin/kubectl-kots"
-"${prefix}${target}/bin/kubectl-kots" completion bash >"${prefix}${target}/share/bash-completion/completions/kubectl-kots"
-"${prefix}${target}/bin/kubectl-kots" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubectl-kots.fish"
-"${prefix}${target}/bin/kubectl-kots" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubectl-kots"
+mv "${prefix}/bin/kots" "${prefix}/bin/kubectl-kots"
+"${prefix}/bin/kubectl-kots" completion bash >"${prefix}/share/bash-completion/completions/kubectl-kots"
+"${prefix}/bin/kubectl-kots" completion fish >"${prefix}/share/fish/vendor_completions.d/kubectl-kots.fish"
+"${prefix}/bin/kubectl-kots" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubectl-kots"
 EOF
\ No newline at end of file
diff --git a/tools/kp/Dockerfile.template b/tools/kp/Dockerfile.template
index 58611f89d6..44d9c291c1 100644
--- a/tools/kp/Dockerfile.template
+++ b/tools/kp/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "vmware-tanzu/kpack-cli" "v${version}" "kp-linux-amd64-${version}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kp" \
+curl --silent --location --fail --output "${prefix}/bin/kp" \
     "https://github.com/vmware-tanzu/kpack-cli/releases/download/v${version}/kp-linux-amd64-${version}"
-chmod +x "${prefix}${target}/bin/kp"
-"${prefix}${target}/bin/kp" completion bash >"${prefix}${target}/share/bash-completion/completions/kp"
-"${prefix}${target}/bin/kp" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kp.fish"
-"${prefix}${target}/bin/kp" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kp"
+chmod +x "${prefix}/bin/kp"
+"${prefix}/bin/kp" completion bash >"${prefix}/share/bash-completion/completions/kp"
+"${prefix}/bin/kp" completion fish >"${prefix}/share/fish/vendor_completions.d/kp.fish"
+"${prefix}/bin/kp" completion zsh >"${prefix}/share/zsh/vendor-completions/_kp"
 EOF
\ No newline at end of file
diff --git a/tools/kpt/Dockerfile.template b/tools/kpt/Dockerfile.template
index eeef3daf1d..b1fff779c3 100644
--- a/tools/kpt/Dockerfile.template
+++ b/tools/kpt/Dockerfile.template
@@ -10,13 +10,13 @@ ARG version
 RUN <<EOF
 check-github-release-asset "GoogleContainerTools/kpt" "v${version}" "kpt_linux_${alt_arch}-${version}.tar.gz"
 curl --silent --location --fail "https://github.com/GoogleContainerTools/kpt/releases/download/v${version}/kpt_linux_${alt_arch}-${version}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     kpt
 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/krew/Dockerfile.template b/tools/krew/Dockerfile.template
index 1a80e0c228..7e5d83c415 100644
--- a/tools/krew/Dockerfile.template
+++ b/tools/krew/Dockerfile.template
@@ -10,7 +10,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/krew" "v${version}" "krew-linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kubernetes-sigs/krew/releases/download/v${version}/krew-linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     ./krew-linux_${alt_arch}
-mv "${prefix}${target}/bin/krew-linux_${alt_arch}" "${prefix}${target}/bin/krew"
+mv "${prefix}/bin/krew-linux_${alt_arch}" "${prefix}/bin/krew"
 EOF
\ No newline at end of file
diff --git a/tools/ksort/Dockerfile.template b/tools/ksort/Dockerfile.template
index 743719acdd..8e49660b30 100644
--- a/tools/ksort/Dockerfile.template
+++ b/tools/ksort/Dockerfile.template
@@ -13,5 +13,5 @@ url="https://github.com/superbrothers/ksort/releases/download/v${version}/ksort-
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
 unzip -q -o -d /tmp "${filename}"
-mv /tmp/ksort "${prefix}${target}/bin/"
+mv /tmp/ksort "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/ktop/Dockerfile.template b/tools/ktop/Dockerfile.template
index 1e5a2ac554..86cbed7da5 100644
--- a/tools/ktop/Dockerfile.template
+++ b/tools/ktop/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "vladimirvivien/ktop" "v${version}" "ktop_v${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/vladimirvivien/ktop/releases/download/v${version}/ktop_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 \
     ktop
 EOF
\ No newline at end of file
diff --git a/tools/ktunnel/Dockerfile.template b/tools/ktunnel/Dockerfile.template
index 564ac170fc..94797c6032 100644
--- a/tools/ktunnel/Dockerfile.template
+++ b/tools/ktunnel/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "omrikiei/ktunnel" "v${version}" "ktunnel_${version}_Linux_x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/omrikiei/ktunnel/releases/download/v${version}/ktunnel_${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 \
     ktunnel
 EOF
\ No newline at end of file
diff --git a/tools/kube-apiserver/Dockerfile.template b/tools/kube-apiserver/Dockerfile.template
index dc8d0985f1..5bc74b77bd 100644
--- a/tools/kube-apiserver/Dockerfile.template
+++ b/tools/kube-apiserver/Dockerfile.template
@@ -11,16 +11,16 @@ COPY --from=cosign / /
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kube-apiserver" \
+curl --silent --location --fail --output "${prefix}/bin/kube-apiserver" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-apiserver"
-chmod +x "${prefix}${target}/bin/kube-apiserver"
+chmod +x "${prefix}/bin/kube-apiserver"
 
 echo "Verifying keyless signature for kube-apiserver"
 curl --silent --location --fail --output "/tmp/kube-apiserver.sig" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-apiserver.sig"
 curl --silent --location --fail --output "/tmp/kube-apiserver.cert" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-apiserver.cert"
-COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kube-apiserver" \
+COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kube-apiserver" \
     --signature "/tmp/kube-apiserver.sig" \
     --certificate "/tmp/kube-apiserver.cert" \
     --certificate-oidc-issuer https://accounts.google.com \
diff --git a/tools/kube-bench/Dockerfile.template b/tools/kube-bench/Dockerfile.template
index 1e5ef7a544..b4921151b3 100644
--- a/tools/kube-bench/Dockerfile.template
+++ b/tools/kube-bench/Dockerfile.template
@@ -10,10 +10,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "aquasecurity/kube-bench" "v${version}" "kube-bench_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/aquasecurity/kube-bench/releases/download/v${version}/kube-bench_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner
-"${prefix}${target}/bin/kube-bench" completion bash | sed "s|${prefix}||g" >"${prefix}${target}/share/bash-completion/completions/kube-bench"
-"${prefix}${target}/bin/kube-bench" completion fish | sed "s|${prefix}||g" >"${prefix}${target}/share/fish/vendor_completions.d/kube-bench.fish"
-"${prefix}${target}/bin/kube-bench" completion zsh  | sed "s|${prefix}||g" >"${prefix}${target}/share/zsh/vendor-completions/_kube-bench"
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner
+"${prefix}/bin/kube-bench" completion bash | sed "s|${prefix}||g" >"${prefix}/share/bash-completion/completions/kube-bench"
+"${prefix}/bin/kube-bench" completion fish | sed "s|${prefix}||g" >"${prefix}/share/fish/vendor_completions.d/kube-bench.fish"
+"${prefix}/bin/kube-bench" completion zsh  | sed "s|${prefix}||g" >"${prefix}/share/zsh/vendor-completions/_kube-bench"
 mkdir -p "${prefix}/etc/kube-bench"
-mv "${prefix}${target}/bin/cfg" "${prefix}/etc/kube-bench"
+mv "${prefix}/bin/cfg" "${prefix}/etc/kube-bench"
 EOF
\ No newline at end of file
diff --git a/tools/kube-controller-manager/Dockerfile.template b/tools/kube-controller-manager/Dockerfile.template
index 1712bce3e7..504a1648f5 100644
--- a/tools/kube-controller-manager/Dockerfile.template
+++ b/tools/kube-controller-manager/Dockerfile.template
@@ -11,16 +11,16 @@ COPY --from=cosign / /
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kube-controller-manager" \
+curl --silent --location --fail --output "${prefix}/bin/kube-controller-manager" \
     "https://storage.googleapis.com/kubernetes-release/release/v${version}/bin/linux/${alt_arch}/kube-controller-manager"
-chmod +x "${prefix}${target}/bin/kube-controller-manager"
+chmod +x "${prefix}/bin/kube-controller-manager"
 
 echo "Verifying keyless signature for kube-controller-manager"
 curl --silent --location --fail --output "/tmp/kube-controller-manager.sig" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-controller-manager.sig"
 curl --silent --location --fail --output "/tmp/kube-controller-manager.cert" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-controller-manager.cert"
-COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kube-controller-manager" \
+COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kube-controller-manager" \
     --signature "/tmp/kube-controller-manager.sig" \
     --certificate "/tmp/kube-controller-manager.cert" \
     --certificate-oidc-issuer https://accounts.google.com \
diff --git a/tools/kube-linter/Dockerfile.template b/tools/kube-linter/Dockerfile.template
index 716133bfd8..c5c96db936 100644
--- a/tools/kube-linter/Dockerfile.template
+++ b/tools/kube-linter/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "stackrox/kube-linter" "${version}" "kube-linter-linux"
-curl --silent --location --fail --output "${prefix}${target}/bin/kube-linter" \
+curl --silent --location --fail --output "${prefix}/bin/kube-linter" \
     "https://github.com/stackrox/kube-linter/releases/download/${version}/kube-linter-linux"
-chmod +x "${prefix}${target}/bin/kube-linter"
-"${prefix}${target}/bin/kube-linter" completion bash >"${prefix}${target}/share/bash-completion/completions/kube-linter"
-"${prefix}${target}/bin/kube-linter" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kube-linter.fish"
-"${prefix}${target}/bin/kube-linter" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kube-linter"
+chmod +x "${prefix}/bin/kube-linter"
+"${prefix}/bin/kube-linter" completion bash >"${prefix}/share/bash-completion/completions/kube-linter"
+"${prefix}/bin/kube-linter" completion fish >"${prefix}/share/fish/vendor_completions.d/kube-linter.fish"
+"${prefix}/bin/kube-linter" completion zsh >"${prefix}/share/zsh/vendor-completions/_kube-linter"
 EOF
\ No newline at end of file
diff --git a/tools/kube-proxy/Dockerfile.template b/tools/kube-proxy/Dockerfile.template
index 012a2bda75..b172f182dc 100644
--- a/tools/kube-proxy/Dockerfile.template
+++ b/tools/kube-proxy/Dockerfile.template
@@ -11,16 +11,16 @@ COPY --from=cosign / /
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kube-proxy" \
+curl --silent --location --fail --output "${prefix}/bin/kube-proxy" \
     "https://storage.googleapis.com/kubernetes-release/release/v${version}/bin/linux/${alt_arch}/kube-proxy"
-chmod +x "${prefix}${target}/bin/kube-proxy"
+chmod +x "${prefix}/bin/kube-proxy"
 
 echo "Verifying keyless signature for kube-proxy"
 curl --silent --location --fail --output "/tmp/kube-proxy.sig" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-proxy.sig"
 curl --silent --location --fail --output "/tmp/kube-proxy.cert" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-proxy.cert"
-COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kube-proxy" \
+COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kube-proxy" \
     --signature "/tmp/kube-proxy.sig" \
     --certificate "/tmp/kube-proxy.cert" \
     --certificate-oidc-issuer https://accounts.google.com \
diff --git a/tools/kube-psp-advisor/Dockerfile.template b/tools/kube-psp-advisor/Dockerfile.template
index 6fb2c3183c..9c587dae58 100644
--- a/tools/kube-psp-advisor/Dockerfile.template
+++ b/tools/kube-psp-advisor/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "sysdiglabs/kube-psp-advisor" "v${version}" "kube-psp-advisor_v${version}_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/sysdiglabs/kube-psp-advisor/releases/download/v${version}/kube-psp-advisor_v${version}_linux_amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     kubectl-advise-psp
 EOF
\ No newline at end of file
diff --git a/tools/kube-scheduler/Dockerfile.template b/tools/kube-scheduler/Dockerfile.template
index 8e7062e001..964adf19c9 100644
--- a/tools/kube-scheduler/Dockerfile.template
+++ b/tools/kube-scheduler/Dockerfile.template
@@ -11,16 +11,16 @@ COPY --from=cosign / /
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kube-scheduler" \
+curl --silent --location --fail --output "${prefix}/bin/kube-scheduler" \
     "https://storage.googleapis.com/kubernetes-release/release/v${version}/bin/linux/${alt_arch}/kube-scheduler"
-chmod +x "${prefix}${target}/bin/kube-scheduler"
+chmod +x "${prefix}/bin/kube-scheduler"
 
 echo "Verifying keyless signature for kube-scheduler"
 curl --silent --location --fail --output "/tmp/kube-scheduler.sig" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-scheduler.sig"
 curl --silent --location --fail --output "/tmp/kube-scheduler.cert" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kube-scheduler.cert"
-COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kube-scheduler" \
+COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kube-scheduler" \
     --signature "/tmp/kube-scheduler.sig" \
     --certificate "/tmp/kube-scheduler.cert" \
     --certificate-oidc-issuer https://accounts.google.com \
diff --git a/tools/kube-score/Dockerfile.template b/tools/kube-score/Dockerfile.template
index 83dfb991b8..589d35cc41 100644
--- a/tools/kube-score/Dockerfile.template
+++ b/tools/kube-score/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "zegl/kube-score" "v${version}" "kube-score_${version}_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kube-score" \
+curl --silent --location --fail --output "${prefix}/bin/kube-score" \
     "https://github.com/zegl/kube-score/releases/download/v${version}/kube-score_${version}_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/kube-score"
+chmod +x "${prefix}/bin/kube-score"
 EOF
\ No newline at end of file
diff --git a/tools/kubeadm/Dockerfile.template b/tools/kubeadm/Dockerfile.template
index 618f1fdf1b..4d01ca9a9e 100644
--- a/tools/kubeadm/Dockerfile.template
+++ b/tools/kubeadm/Dockerfile.template
@@ -10,11 +10,11 @@ SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
-COPY kubelet.service ${prefix}${target}/etc/systemd/system/
+COPY kubelet.service ${prefix}/etc/systemd/system/
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kubeadm" \
+curl --silent --location --fail --output "${prefix}/bin/kubeadm" \
     "https://storage.googleapis.com/kubernetes-release/release/v${version}/bin/linux/${alt_arch}/kubeadm"
-chmod +x "${prefix}${target}/bin/kubeadm"
+chmod +x "${prefix}/bin/kubeadm"
 
 if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.0-beta.0"; then
     echo "Verifying keyless signature for kubeadm"
@@ -22,7 +22,7 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubeadm.sig"
     curl --silent --location --fail --output "/tmp/kubeadm.cert" \
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubeadm.cert"
-    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kubeadm" \
+    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kubeadm" \
         --signature "/tmp/kubeadm.sig" \
         --certificate "/tmp/kubeadm.cert" \
         --certificate-oidc-issuer https://accounts.google.com \
@@ -32,6 +32,6 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "/tmp/kubeadm.cert"
 fi
 
-"${prefix}${target}/bin/kubeadm" completion bash >"${prefix}${target}/share/bash-completion/completions/kubeadm"
-"${prefix}${target}/bin/kubeadm" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubeadm"
+"${prefix}/bin/kubeadm" completion bash >"${prefix}/share/bash-completion/completions/kubeadm"
+"${prefix}/bin/kubeadm" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubeadm"
 EOF
\ No newline at end of file
diff --git a/tools/kubeaudit/Dockerfile.template b/tools/kubeaudit/Dockerfile.template
index 8f30483586..4bed43a745 100644
--- a/tools/kubeaudit/Dockerfile.template
+++ b/tools/kubeaudit/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "Shopify/kubeaudit" "v${version}" "kubeaudit_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/Shopify/kubeaudit/releases/download/v${version}/kubeaudit_${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 \
     kubeaudit
-"${prefix}${target}/bin/kubeaudit" completion bash >"${prefix}${target}/share/bash-completion/completions/kubeaudit"
-"${prefix}${target}/bin/kubeaudit" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubeaudit.fish"
-"${prefix}${target}/bin/kubeaudit" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubeaudit"
+"${prefix}/bin/kubeaudit" completion bash >"${prefix}/share/bash-completion/completions/kubeaudit"
+"${prefix}/bin/kubeaudit" completion fish >"${prefix}/share/fish/vendor_completions.d/kubeaudit.fish"
+"${prefix}/bin/kubeaudit" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubeaudit"
 EOF
\ No newline at end of file
diff --git a/tools/kubebox/Dockerfile.template b/tools/kubebox/Dockerfile.template
index 8a513a1d67..389148803c 100644
--- a/tools/kubebox/Dockerfile.template
+++ b/tools/kubebox/Dockerfile.template
@@ -10,12 +10,12 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
-WORKDIR ${prefix}${target}/libexec/kubebox
+WORKDIR ${prefix}/libexec/kubebox
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "kubebox@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/kubebox/node_modules/.bin/kubebox" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/kubebox/node_modules/.bin/kubebox" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/kubeclarity-cli/Dockerfile.template b/tools/kubeclarity-cli/Dockerfile.template
index adcbc3d1e9..f5d9b2864e 100644
--- a/tools/kubeclarity-cli/Dockerfile.template
+++ b/tools/kubeclarity-cli/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "openclarity/kubeclarity" "v${version}" "kubeclarity-cli-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/openclarity/kubeclarity/releases/download/v${version}/kubeclarity-cli-${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 \
     kubeclarity-cli
-"${prefix}${target}/bin/kubeclarity-cli" completion bash >"${prefix}${target}/share/bash-completion/completions/kubeclarity-cli"
-"${prefix}${target}/bin/kubeclarity-cli" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubeclarity-cli.fish"
-"${prefix}${target}/bin/kubeclarity-cli" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubeclarity-cli"
+"${prefix}/bin/kubeclarity-cli" completion bash >"${prefix}/share/bash-completion/completions/kubeclarity-cli"
+"${prefix}/bin/kubeclarity-cli" completion fish >"${prefix}/share/fish/vendor_completions.d/kubeclarity-cli.fish"
+"${prefix}/bin/kubeclarity-cli" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubeclarity-cli"
 EOF
\ No newline at end of file
diff --git a/tools/kubecolor/Dockerfile.template b/tools/kubecolor/Dockerfile.template
index d09f60e04c..3f2d8b56ea 100644
--- a/tools/kubecolor/Dockerfile.template
+++ b/tools/kubecolor/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 
 curl --silent --location --fail "https://github.com/hidetatz/kubecolor/releases/download/v${version}/kubecolor_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     kubecolor
 EOF
\ No newline at end of file
diff --git a/tools/kubeconform/Dockerfile.template b/tools/kubeconform/Dockerfile.template
index f8509bd038..1834f0d729 100644
--- a/tools/kubeconform/Dockerfile.template
+++ b/tools/kubeconform/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "yannh/kubeconform" "v${version}" "kubeconform-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/yannh/kubeconform/releases/download/v${version}/kubeconform-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     kubeconform
 EOF
\ No newline at end of file
diff --git a/tools/kubectl-aliases/Dockerfile.template b/tools/kubectl-aliases/Dockerfile.template
index ac89924430..7b17d187de 100644
--- a/tools/kubectl-aliases/Dockerfile.template
+++ b/tools/kubectl-aliases/Dockerfile.template
@@ -8,6 +8,6 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/etc/profile.d/kubectl-aliases" \
+curl --silent --location --fail --output "${prefix}/etc/profile.d/kubectl-aliases" \
     "https://github.com/ahmetb/kubectl-aliases/raw/master/.kubectl_aliases"
 EOF
\ No newline at end of file
diff --git a/tools/kubectl-build/Dockerfile.template b/tools/kubectl-build/Dockerfile.template
index dea6bbc269..d31924c80d 100644
--- a/tools/kubectl-build/Dockerfile.template
+++ b/tools/kubectl-build/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "vmware-tanzu/buildkit-cli-for-kubectl" "v${version}" "linux-v${version}.tgz"
 curl --silent --location --fail "https://github.com/vmware-tanzu/buildkit-cli-for-kubectl/releases/download/v${version}/linux-v${version}.tgz" \
-| 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/kubectl-free/Dockerfile.template b/tools/kubectl-free/Dockerfile.template
index ce08e3dafb..42b2fa271b 100644
--- a/tools/kubectl-free/Dockerfile.template
+++ b/tools/kubectl-free/Dockerfile.template
@@ -12,5 +12,5 @@ check-github-release-asset "makocchi-git/kubectl-free" "v${version}" "kubectl-fr
 curl --silent --location --fail --remote-name "https://github.com/makocchi-git/kubectl-free/releases/download/v${version}/kubectl-free_${version}_Linux_${arch}.zip"
 unzip -q -o -d "/tmp" "kubectl-free_${version}_Linux_${arch}.zip"
 rm "kubectl-free_${version}_Linux_${arch}.zip"
-mv "/tmp/kubectl-free_${version}_Linux_${arch}/kubectl-free" "${prefix}${target}/bin"
+mv "/tmp/kubectl-free_${version}_Linux_${arch}/kubectl-free" "${prefix}/bin"
 EOF
\ No newline at end of file
diff --git a/tools/kubectl-plugins/Dockerfile.template b/tools/kubectl-plugins/Dockerfile.template
index 919cb7fbac..00ad00764e 100644
--- a/tools/kubectl-plugins/Dockerfile.template
+++ b/tools/kubectl-plugins/Dockerfile.template
@@ -17,18 +17,18 @@ SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=krew / /
 ARG name
 ARG version
-COPY --chmod=755 <<EOF ${prefix}${target}/bin/krew-uniget
+COPY --chmod=755 <<EOF ${prefix}/bin/krew-uniget
 #!/bin/bash
 set -o errexit
 
-export KREW_ROOT="${target}/libexec/krew"
+export KREW_ROOT="/libexec/krew"
 krew "\$@"
 EOF
-COPY <<EOF ${prefix}${target}/etc/profile.d/krew.sh
-export PATH="${target}/libexec/krew/bin:${PATH}"
+COPY <<EOF ${prefix}/etc/profile.d/krew.sh
+export PATH="/libexec/krew/bin:${PATH}"
 EOF
 RUN <<EOF
-export KREW_ROOT="${prefix}${target}/libexec/krew"
+export KREW_ROOT="${prefix}/libexec/krew"
 mkdir -p "${KREW_ROOT}"
 krew update
 krew install krew
@@ -115,5 +115,5 @@ for plugin in "${plugins[@]}"; do
     echo "Processing ${plugin}"
     krew install "${plugin}"
 done
-find "${KREW_ROOT}/bin" -type l -exec ln --symbolic --relative --force {} "${prefix}${target}/bin/" \;
+find "${KREW_ROOT}/bin" -type l -exec ln --symbolic --relative --force {} "${prefix}/bin/" \;
 EOF
diff --git a/tools/kubectl-resources/Dockerfile.template b/tools/kubectl-resources/Dockerfile.template
index b1f7dd36ac..b37ed65f86 100644
--- a/tools/kubectl-resources/Dockerfile.template
+++ b/tools/kubectl-resources/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "howardjohn/kubectl-resources" "v${version}" "kubectl-resources_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/howardjohn/kubectl-resources/releases/download/v${version}/kubectl-resources_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kubectl-resources
 EOF
\ No newline at end of file
diff --git a/tools/kubectl-ssh-proxy/Dockerfile.template b/tools/kubectl-ssh-proxy/Dockerfile.template
index 7a433c0852..3d97d29cfe 100644
--- a/tools/kubectl-ssh-proxy/Dockerfile.template
+++ b/tools/kubectl-ssh-proxy/Dockerfile.template
@@ -10,7 +10,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "little-angry-clouds/kubectl-ssh-proxy" "${version}" "kubectl-ssh-proxy-linux-amd64.tar.gz"
 curl --silent --location --fail "https://github.com/little-angry-clouds/kubectl-ssh-proxy/releases/download/${version}/kubectl-ssh-proxy-linux-amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
-mv "${prefix}${target}/bin/kubectl-ssh_proxy-linux-amd64" "${prefix}${target}/bin/kubectl-ssh_proxy"
-mv "${prefix}${target}/bin/kube-ssh-proxy-ssh-bin-linux-amd64" "${prefix}${target}/bin/kube-ssh-proxy-ssh-bin"
+| tar --extract --gzip --directory="${prefix}" --no-same-owner
+mv "${prefix}/bin/kubectl-ssh_proxy-linux-amd64" "${prefix}/bin/kubectl-ssh_proxy"
+mv "${prefix}/bin/kube-ssh-proxy-ssh-bin-linux-amd64" "${prefix}/bin/kube-ssh-proxy-ssh-bin"
 EOF
\ No newline at end of file
diff --git a/tools/kubectl/Dockerfile.template b/tools/kubectl/Dockerfile.template
index 9c170dddb0..7a72f6d5ee 100644
--- a/tools/kubectl/Dockerfile.template
+++ b/tools/kubectl/Dockerfile.template
@@ -10,11 +10,11 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 COPY --from=cosign / /
-COPY kubectl.sh ${prefix}${target}/etc/profile.d/
+COPY kubectl.sh ${prefix}/etc/profile.d/
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kubectl" \
+curl --silent --location --fail --output "${prefix}/bin/kubectl" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubectl"
-chmod +x "${prefix}${target}/bin/kubectl"
+chmod +x "${prefix}/bin/kubectl"
 
 if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.0-beta.0"; then
     echo "Verifying keyless signature for kubectl"
@@ -22,7 +22,7 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubectl.sig"
     curl --silent --location --fail --output "/tmp/kubectl.cert" \
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubectl.cert"
-    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kubectl" \
+    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kubectl" \
         --signature "/tmp/kubectl.sig" \
         --certificate "/tmp/kubectl.cert" \
         --certificate-oidc-issuer https://accounts.google.com \
@@ -32,9 +32,9 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "/tmp/kubectl.cert"
 fi
 
-curl --silent --location --fail --output "${prefix}${target}/bin/kubectl-convert" \
+curl --silent --location --fail --output "${prefix}/bin/kubectl-convert" \
     "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubectl-convert"
-chmod +x "${prefix}${target}/bin/kubectl-convert"
+chmod +x "${prefix}/bin/kubectl-convert"
 
 if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.0-beta.0"; then
     echo "Verifying keyless signature for kubectl-convert"
@@ -42,7 +42,7 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubectl-convert.sig"
     curl --silent --location --fail --output "/tmp/kubectl-convert.cert" \
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubectl-convert.cert"
-    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kubectl-convert" \
+    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kubectl-convert" \
         --signature "/tmp/kubectl-convert.sig" \
         --certificate "/tmp/kubectl-convert.cert" \
         --certificate-oidc-issuer https://accounts.google.com \
@@ -52,6 +52,6 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "/tmp/kubectl-convert.cert"
 fi
 
-"${prefix}${target}/bin/kubectl" completion bash >"${prefix}${target}/share/bash-completion/completions/kubectl"
-"${prefix}${target}/bin/kubectl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubectl"
+"${prefix}/bin/kubectl" completion bash >"${prefix}/share/bash-completion/completions/kubectl"
+"${prefix}/bin/kubectl" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubectl"
 EOF
\ No newline at end of file
diff --git a/tools/kubefire/Dockerfile.template b/tools/kubefire/Dockerfile.template
index ad0e432f67..effe4a5152 100644
--- a/tools/kubefire/Dockerfile.template
+++ b/tools/kubefire/Dockerfile.template
@@ -10,15 +10,15 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "innobead/kubefire" "v${version}" "kubefire-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kubefire" \
+curl --silent --location --fail --output "${prefix}/bin/kubefire" \
     "https://github.com/innobead/kubefire/releases/download/v${version}/kubefire-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kubefire"
+chmod +x "${prefix}/bin/kubefire"
 EOF
 
 RUN <<EOF
 check-github-release-asset "innobead/kubefire" "v${version}" "kubefire-linux-${alt_arch}"
-mkdir -p "${prefix}${target}/libexec/cni"
-curl --silent --location --fail --output "${prefix}${target}/libexec/cni/host-local-rev" \
+mkdir -p "${prefix}/libexec/cni"
+curl --silent --location --fail --output "${prefix}/libexec/cni/host-local-rev" \
     "https://github.com/innobead/kubefire/releases/download/v${version}/host-local-rev-linux-${alt_arch}"
-chmod +x "${prefix}${target}/libexec/cni/host-local-rev"
+chmod +x "${prefix}/libexec/cni/host-local-rev"
 EOF
\ No newline at end of file
diff --git a/tools/kubelet/Dockerfile.template b/tools/kubelet/Dockerfile.template
index eccd82e27b..9a8c82f9e1 100644
--- a/tools/kubelet/Dockerfile.template
+++ b/tools/kubelet/Dockerfile.template
@@ -10,11 +10,11 @@ SHELL [ "bash", "-clo", "errexit" ]
 COPY --from=cosign / /
 ARG name
 ARG version
-COPY kubelet.service ${prefix}${target}/etc/systemd/system/
+COPY kubelet.service ${prefix}/etc/systemd/system/
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${target}/bin/kubelet" \
+curl --silent --location --fail --output "${prefix}/bin/kubelet" \
     "https://storage.googleapis.com/kubernetes-release/release/v${version}/bin/linux/${alt_arch}/kubelet"
-chmod +x "${prefix}${target}/bin/kubelet"
+chmod +x "${prefix}/bin/kubelet"
 
 if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.0-beta.0"; then
     echo "Verifying keyless signature for kubelet"
@@ -22,7 +22,7 @@ if test "$(echo -e "1.26.0-beta.0\n${version}" | sort -V | head -n 1)" == "1.26.
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubelet.sig"
     curl --silent --location --fail --output "/tmp/kubelet.cert" \
         "https://dl.k8s.io/release/v${version}/bin/linux/${alt_arch}/kubelet.cert"
-    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}${target}/bin/kubelet" \
+    COSIGN_EXPERIMENTAL=1 cosign verify-blob "${prefix}/bin/kubelet" \
         --signature "/tmp/kubelet.sig" \
         --certificate "/tmp/kubelet.cert" \
         --certificate-oidc-issuer https://accounts.google.com \
diff --git a/tools/kubeletctl/Dockerfile.template b/tools/kubeletctl/Dockerfile.template
index 5c6c8202ea..7d5378a17a 100644
--- a/tools/kubeletctl/Dockerfile.template
+++ b/tools/kubeletctl/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "cyberark/kubeletctl" "v${version}" "kubeletctl_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kubeletctl" \
+curl --silent --location --fail --output "${prefix}/bin/kubeletctl" \
     "https://github.com/cyberark/kubeletctl/releases/download/v${version}/kubeletctl_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/kubeletctl"
+chmod +x "${prefix}/bin/kubeletctl"
 EOF
\ No newline at end of file
diff --git a/tools/kubent/Dockerfile.template b/tools/kubent/Dockerfile.template
index 9e1a0a7fb1..b084e66c63 100644
--- a/tools/kubent/Dockerfile.template
+++ b/tools/kubent/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "doitintl/kube-no-trouble" "${version}" "kubent-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/doitintl/kube-no-trouble/releases/download/${version}/kubent-${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/kubernetes-json-schema/Dockerfile.template b/tools/kubernetes-json-schema/Dockerfile.template
index 7a564b5fa3..e2cee5d9f5 100644
--- a/tools/kubernetes-json-schema/Dockerfile.template
+++ b/tools/kubernetes-json-schema/Dockerfile.template
@@ -23,8 +23,8 @@ ARG name
 ARG version
 RUN <<EOF
 echo "${name} ${version}"
-mkdir -p "${prefix}${target}/share/kubernetes/${version}"
+mkdir -p "${prefix}/share/kubernetes/${version}"
 mkdir -p "/tmp/openapi2jsonschema/${prefix}/usr/local/share/kubernetes/${version}"
-python /tmp/openapi2jsonschema/openapi2jsonschema/command.py -o "${prefix}${target}/share/kubernetes/${version}" --expanded --kubernetes --stand-alone --strict "https://github.com/kubernetes/kubernetes/raw/v${version}/api/openapi-spec/swagger.json"
-python /tmp/openapi2jsonschema/openapi2jsonschema/command.py -o "${prefix}${target}/share/kubernetes/${version}"            --kubernetes --stand-alone --strict "https://github.com/kubernetes/kubernetes/raw/v${version}/api/openapi-spec/swagger.json"
+python /tmp/openapi2jsonschema/openapi2jsonschema/command.py -o "${prefix}/share/kubernetes/${version}" --expanded --kubernetes --stand-alone --strict "https://github.com/kubernetes/kubernetes/raw/v${version}/api/openapi-spec/swagger.json"
+python /tmp/openapi2jsonschema/openapi2jsonschema/command.py -o "${prefix}/share/kubernetes/${version}"            --kubernetes --stand-alone --strict "https://github.com/kubernetes/kubernetes/raw/v${version}/api/openapi-spec/swagger.json"
 EOF
diff --git a/tools/kubescape/Dockerfile.template b/tools/kubescape/Dockerfile.template
index 9f6cf97db2..e2ac4748be 100644
--- a/tools/kubescape/Dockerfile.template
+++ b/tools/kubescape/Dockerfile.template
@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "armosec/kubescape" "v${version}" "kubescape-ubuntu-latest.tar.gz"
 curl --silent --location --fail "https://github.com/armosec/kubescape/releases/download/v${version}/kubescape-ubuntu-latest.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner
-"${prefix}${target}/bin/kubescape" completion bash >"${prefix}${target}/share/bash-completion/completions/kubescape"
-"${prefix}${target}/bin/kubescape" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubescape.fish"
-"${prefix}${target}/bin/kubescape" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubescape"
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner
+"${prefix}/bin/kubescape" completion bash >"${prefix}/share/bash-completion/completions/kubescape"
+"${prefix}/bin/kubescape" completion fish >"${prefix}/share/fish/vendor_completions.d/kubescape.fish"
+"${prefix}/bin/kubescape" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubescape"
 EOF
\ No newline at end of file
diff --git a/tools/kubeseal/Dockerfile.template b/tools/kubeseal/Dockerfile.template
index ecb510b693..431e0fe224 100644
--- a/tools/kubeseal/Dockerfile.template
+++ b/tools/kubeseal/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "bitnami-labs/sealed-secrets" "v${version}" "kubeseal-${version}-linux-amd64.tar.gz"
 curl --silent --location --fail "https://github.com/bitnami-labs/sealed-secrets/releases/download/v${version}/kubeseal-${version}-linux-amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     kubeseal
 EOF
\ No newline at end of file
diff --git a/tools/kubesec/Dockerfile.template b/tools/kubesec/Dockerfile.template
index 66b7a36855..1afced98e0 100644
--- a/tools/kubesec/Dockerfile.template
+++ b/tools/kubesec/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "controlplaneio/kubesec" "v${version}" "kubesec_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/controlplaneio/kubesec/releases/download/v${version}/kubesec_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kubesec
-"${prefix}${target}/bin/kubesec" completion bash >"${prefix}${target}/share/bash-completion/completions/kubesec"
-"${prefix}${target}/bin/kubesec" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubesec.fish"
-"${prefix}${target}/bin/kubesec" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubesec"
+"${prefix}/bin/kubesec" completion bash >"${prefix}/share/bash-completion/completions/kubesec"
+"${prefix}/bin/kubesec" completion fish >"${prefix}/share/fish/vendor_completions.d/kubesec.fish"
+"${prefix}/bin/kubesec" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubesec"
 EOF
\ No newline at end of file
diff --git a/tools/kubeshark/Dockerfile.template b/tools/kubeshark/Dockerfile.template
index c9845116fe..98157bff94 100644
--- a/tools/kubeshark/Dockerfile.template
+++ b/tools/kubeshark/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubeshark/kubeshark" "${version}" "kubeshark_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kubeshark" \
+curl --silent --location --fail --output "${prefix}/bin/kubeshark" \
     "https://github.com/kubeshark/kubeshark/releases/download/${version}/kubeshark_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/kubeshark"
-"${prefix}${target}/bin/kubeshark" completion bash >"${prefix}${target}/share/bash-completion/completions/kubeshark"
-"${prefix}${target}/bin/kubeshark" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubeshark.fish"
-"${prefix}${target}/bin/kubeshark" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubeshark"
+chmod +x "${prefix}/bin/kubeshark"
+"${prefix}/bin/kubeshark" completion bash >"${prefix}/share/bash-completion/completions/kubeshark"
+"${prefix}/bin/kubeshark" completion fish >"${prefix}/share/fish/vendor_completions.d/kubeshark.fish"
+"${prefix}/bin/kubeshark" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubeshark"
 EOF
diff --git a/tools/kubeswitch/Dockerfile.template b/tools/kubeswitch/Dockerfile.template
index e2cd9c9339..5f1302c469 100644
--- a/tools/kubeswitch/Dockerfile.template
+++ b/tools/kubeswitch/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "danielb42/kubeswitch" "v${version}" "kubeswitch_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/danielb42/kubeswitch/releases/download/v${version}/kubeswitch_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kubeswitch
 EOF
\ No newline at end of file
diff --git a/tools/kubeval/Dockerfile.template b/tools/kubeval/Dockerfile.template
index 572f8040ff..e1fc07699d 100644
--- a/tools/kubeval/Dockerfile.template
+++ b/tools/kubeval/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "instrumenta/kubeval" "v${version}" "kubeval-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/instrumenta/kubeval/releases/download/v${version}/kubeval-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     kubeval
 EOF
\ No newline at end of file
diff --git a/tools/kubo/Dockerfile.template b/tools/kubo/Dockerfile.template
index 2f3e5493d8..cc05105fe6 100644
--- a/tools/kubo/Dockerfile.template
+++ b/tools/kubo/Dockerfile.template
@@ -8,20 +8,20 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 
-COPY ipfs.service ${prefix}${target}/etc/systemd/system
+COPY ipfs.service ${prefix}/etc/systemd/system
 
 RUN <<EOF
 check-github-release-asset "ipfs/kubo" "v${version}" "kubo_v${version}_linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ipfs/kubo/releases/download/v${version}/kubo_v${version}_linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     kubo/ipfs
-"${prefix}${target}/bin/ipfs" commands completion bash >"${prefix}${target}/share/bash-completion/completions/ipfs"
+"${prefix}/bin/ipfs" commands completion bash >"${prefix}/share/bash-completion/completions/ipfs"
 EOF
 
 RUN <<EOF
-export IPFS_PATH="${prefix}${target}/var/lib/ipfs"
+export IPFS_PATH="${prefix}/var/lib/ipfs"
 mkdir -p "${IPFS_PATH}"
-"${prefix}${target}/bin/ipfs" init
-"${prefix}${target}/bin/ipfs" config Addresses.API "/ip4/127.0.0.1/tcp/5888"
-"${prefix}${target}/bin/ipfs" config Addresses.Gateway "/ip4/127.0.0.1/tcp/5889"
+"${prefix}/bin/ipfs" init
+"${prefix}/bin/ipfs" config Addresses.API "/ip4/127.0.0.1/tcp/5888"
+"${prefix}/bin/ipfs" config Addresses.Gateway "/ip4/127.0.0.1/tcp/5889"
 EOF
\ No newline at end of file
diff --git a/tools/kudo/Dockerfile.template b/tools/kudo/Dockerfile.template
index c682d8b015..d4343b69ee 100644
--- a/tools/kudo/Dockerfile.template
+++ b/tools/kudo/Dockerfile.template
@@ -25,6 +25,6 @@ check-github-release-asset "kudobuilder/kudo" "v${version}" "kudo_${version}_lin
 
 echo "### Downloading kudo ${version}"
 curl --silent --location --fail "https://github.com/kudobuilder/kudo/releases/download/v${version}/kudo_${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 \
     kubectl-kudo
 EOF
\ No newline at end of file
diff --git a/tools/kustomize/Dockerfile.template b/tools/kustomize/Dockerfile.template
index 8ae257c578..b8723dc2aa 100644
--- a/tools/kustomize/Dockerfile.template
+++ b/tools/kustomize/Dockerfile.template
@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/kustomize" "kustomize%2Fv${version}" "kustomize_v${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${version}/kustomize_v${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner
-"${prefix}${target}/bin/kustomize" completion bash >"${prefix}${target}/share/bash-completion/completions/kustomize"
-"${prefix}${target}/bin/kustomize" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kustomize.fish"
-"${prefix}${target}/bin/kustomize" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kustomize"
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner
+"${prefix}/bin/kustomize" completion bash >"${prefix}/share/bash-completion/completions/kustomize"
+"${prefix}/bin/kustomize" completion fish >"${prefix}/share/fish/vendor_completions.d/kustomize.fish"
+"${prefix}/bin/kustomize" completion zsh >"${prefix}/share/zsh/vendor-completions/_kustomize"
 EOF
\ No newline at end of file
diff --git a/tools/kustomizer/Dockerfile.template b/tools/kustomizer/Dockerfile.template
index 6647fc56c2..a1ab90f40b 100644
--- a/tools/kustomizer/Dockerfile.template
+++ b/tools/kustomizer/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "stefanprodan/kustomizer" "v${version}" "kustomizer_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/stefanprodan/kustomizer/releases/download/v${version}/kustomizer_${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 \
     kustomizer
-"${prefix}${target}/bin/kustomizer" completion bash >"${prefix}${target}/share/bash-completion/completions/kustomizer"
-"${prefix}${target}/bin/kustomizer" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kustomizer.fish"
-"${prefix}${target}/bin/kustomizer" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kustomizer"
+"${prefix}/bin/kustomizer" completion bash >"${prefix}/share/bash-completion/completions/kustomizer"
+"${prefix}/bin/kustomizer" completion fish >"${prefix}/share/fish/vendor_completions.d/kustomizer.fish"
+"${prefix}/bin/kustomizer" completion zsh >"${prefix}/share/zsh/vendor-completions/_kustomizer"
 EOF
\ No newline at end of file
diff --git a/tools/kuttl/Dockerfile.template b/tools/kuttl/Dockerfile.template
index 145d88c258..eaa91919c8 100644
--- a/tools/kuttl/Dockerfile.template
+++ b/tools/kuttl/Dockerfile.template
@@ -26,11 +26,11 @@ check-github-release-asset "kudobuilder/kuttl" "v${version}" "kuttl_${version}_l
 
 echo "### Downloading kuttl ${version}"
 curl --silent --location --fail "https://github.com/kudobuilder/kuttl/releases/download/v${version}/kuttl_${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 \
     kubectl-kuttl
 
 echo "### Installing completion"
-"${prefix}${target}/bin/kubectl-kuttl" completion bash >"${prefix}${target}/share/bash-completion/completions/kubectl-kuttl"
-"${prefix}${target}/bin/kubectl-kuttl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kubectl-kuttl.fish"
-"${prefix}${target}/bin/kubectl-kuttl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kubectl-kuttl"
+"${prefix}/bin/kubectl-kuttl" completion bash >"${prefix}/share/bash-completion/completions/kubectl-kuttl"
+"${prefix}/bin/kubectl-kuttl" completion fish >"${prefix}/share/fish/vendor_completions.d/kubectl-kuttl.fish"
+"${prefix}/bin/kubectl-kuttl" completion zsh >"${prefix}/share/zsh/vendor-completions/_kubectl-kuttl"
 EOF
\ No newline at end of file
diff --git a/tools/kwok/Dockerfile.template b/tools/kwok/Dockerfile.template
index 014a74c794..b8fab27f23 100644
--- a/tools/kwok/Dockerfile.template
+++ b/tools/kwok/Dockerfile.template
@@ -9,16 +9,16 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/kwok" "v${version}" "kwok-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kwok" \
+curl --silent --location --fail --output "${prefix}/bin/kwok" \
     "https://github.com/kubernetes-sigs/kwok/releases/download/v${version}/kwok-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kwok"
+chmod +x "${prefix}/bin/kwok"
 
 check-github-release-asset "kubernetes-sigs/kwok" "v${version}" "kwokctl-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/kwokctl" \
+curl --silent --location --fail --output "${prefix}/bin/kwokctl" \
     "https://github.com/kubernetes-sigs/kwok/releases/download/v${version}/kwokctl-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/kwokctl"
+chmod +x "${prefix}/bin/kwokctl"
 
-"${prefix}${target}/bin/kwokctl" completion bash >"${prefix}${target}/share/bash-completion/completions/kwokctl"
-"${prefix}${target}/bin/kwokctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kwokctl.fish"
-"${prefix}${target}/bin/kwokctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kwokctl"
+"${prefix}/bin/kwokctl" completion bash >"${prefix}/share/bash-completion/completions/kwokctl"
+"${prefix}/bin/kwokctl" completion fish >"${prefix}/share/fish/vendor_completions.d/kwokctl.fish"
+"${prefix}/bin/kwokctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_kwokctl"
 EOF
\ No newline at end of file
diff --git a/tools/kyverno/Dockerfile.template b/tools/kyverno/Dockerfile.template
index 9da9c9e9d2..a2fd19ba51 100644
--- a/tools/kyverno/Dockerfile.template
+++ b/tools/kyverno/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "kyverno/kyverno" "v${version}" "kyverno-cli_v${version}_linux_x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/kyverno/kyverno/releases/download/v${version}/kyverno-cli_v${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 \
     kyverno
-"${prefix}${target}/bin/kyverno" completion bash >"${prefix}${target}/share/bash-completion/completions/kyverno"
-"${prefix}${target}/bin/kyverno" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/kyverno.fish"
-"${prefix}${target}/bin/kyverno" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_kyverno"
+"${prefix}/bin/kyverno" completion bash >"${prefix}/share/bash-completion/completions/kyverno"
+"${prefix}/bin/kyverno" completion fish >"${prefix}/share/fish/vendor_completions.d/kyverno.fish"
+"${prefix}/bin/kyverno" completion zsh >"${prefix}/share/zsh/vendor-completions/_kyverno"
 EOF
\ No newline at end of file

From 9e0758a8e200210a2c7f81493ea30504c89c5fd8 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Mon, 1 Jan 2024 22:24:36 +0100
Subject: [PATCH 3/4] Fix builds #2213

---
 tools/k2d/Dockerfile.template                     | 4 ++--
 tools/keybase/Dockerfile.template                 | 2 +-
 tools/keyoxide/Dockerfile.template                | 6 +++---
 tools/kube-apiserver/Dockerfile.template          | 2 +-
 tools/kube-controller-manager/Dockerfile.template | 2 +-
 tools/kube-proxy/Dockerfile.template              | 2 +-
 tools/kube-scheduler/Dockerfile.template          | 2 +-
 tools/kubeadm/Dockerfile.template                 | 2 +-
 tools/kubebox/Dockerfile.template                 | 6 +++---
 tools/kubectl-plugins/Dockerfile.template         | 2 +-
 tools/kubectl/Dockerfile.template                 | 2 +-
 tools/kubelet/Dockerfile.template                 | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tools/k2d/Dockerfile.template b/tools/k2d/Dockerfile.template
index 821e69b0e8..c530ddace7 100644
--- a/tools/k2d/Dockerfile.template
+++ b/tools/k2d/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=go / /
-COPY --link --from=make / /
+COPY --link --from=go / /usr/local/
+COPY --link --from=make / /usr/local/
 WORKDIR /go/src/github.com/portainer/k2d
 ARG name
 ARG version
diff --git a/tools/keybase/Dockerfile.template b/tools/keybase/Dockerfile.template
index 5c448dc61a..c1cda725ca 100644
--- a/tools/keybase/Dockerfile.template
+++ b/tools/keybase/Dockerfile.template
@@ -12,7 +12,7 @@ apt-get update
 apt-get -y install --no-install-recommends \
     build-essential
 EOF
-COPY --link --from=go / /
+COPY --link --from=go / /usr/local/
 WORKDIR /go/src/github.com/keybase/client
 ARG name
 ARG version
diff --git a/tools/keyoxide/Dockerfile.template b/tools/keyoxide/Dockerfile.template
index 1a05d8f866..7d1f3976d4 100644
--- a/tools/keyoxide/Dockerfile.template
+++ b/tools/keyoxide/Dockerfile.template
@@ -8,9 +8,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/keyoxide
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/keyoxide
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/kube-apiserver/Dockerfile.template b/tools/kube-apiserver/Dockerfile.template
index 5bc74b77bd..c474a9e656 100644
--- a/tools/kube-apiserver/Dockerfile.template
+++ b/tools/kube-apiserver/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/kube-controller-manager/Dockerfile.template b/tools/kube-controller-manager/Dockerfile.template
index 504a1648f5..440d1e2b52 100644
--- a/tools/kube-controller-manager/Dockerfile.template
+++ b/tools/kube-controller-manager/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/kube-proxy/Dockerfile.template b/tools/kube-proxy/Dockerfile.template
index b172f182dc..65254c6b97 100644
--- a/tools/kube-proxy/Dockerfile.template
+++ b/tools/kube-proxy/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/kube-scheduler/Dockerfile.template b/tools/kube-scheduler/Dockerfile.template
index 964adf19c9..d48dc55ec3 100644
--- a/tools/kube-scheduler/Dockerfile.template
+++ b/tools/kube-scheduler/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/kubeadm/Dockerfile.template b/tools/kubeadm/Dockerfile.template
index 4d01ca9a9e..aa6d65426e 100644
--- a/tools/kubeadm/Dockerfile.template
+++ b/tools/kubeadm/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 COPY kubelet.service ${prefix}/etc/systemd/system/
diff --git a/tools/kubebox/Dockerfile.template b/tools/kubebox/Dockerfile.template
index 389148803c..29c1894569 100644
--- a/tools/kubebox/Dockerfile.template
+++ b/tools/kubebox/Dockerfile.template
@@ -8,9 +8,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --link --from=nodejs / /
-COPY --link --from=npm / /
-WORKDIR ${prefix}/libexec/kubebox
+COPY --link --from=nodejs / /usr/local/
+COPY --link --from=npm / /usr/local/
+WORKDIR /uniget_bootstrap/libexec/kubebox
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/kubectl-plugins/Dockerfile.template b/tools/kubectl-plugins/Dockerfile.template
index 00ad00764e..8323992a33 100644
--- a/tools/kubectl-plugins/Dockerfile.template
+++ b/tools/kubectl-plugins/Dockerfile.template
@@ -14,7 +14,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=krew / /
+COPY --from=krew / /usr/local/
 ARG name
 ARG version
 COPY --chmod=755 <<EOF ${prefix}/bin/krew-uniget
diff --git a/tools/kubectl/Dockerfile.template b/tools/kubectl/Dockerfile.template
index 7a72f6d5ee..1722e8b0eb 100644
--- a/tools/kubectl/Dockerfile.template
+++ b/tools/kubectl/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 COPY kubectl.sh ${prefix}/etc/profile.d/
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}/bin/kubectl" \
diff --git a/tools/kubelet/Dockerfile.template b/tools/kubelet/Dockerfile.template
index 9a8c82f9e1..2d329b2db2 100644
--- a/tools/kubelet/Dockerfile.template
+++ b/tools/kubelet/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=cosign / /
+COPY --from=cosign / /usr/local/
 ARG name
 ARG version
 COPY kubelet.service ${prefix}/etc/systemd/system/

From 461ad66fd48ab1ee59622ef9be8715494a497b0d Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Mon, 1 Jan 2024 22:36:46 +0100
Subject: [PATCH 4/4] Fixed build #2213

---
 tools/k2d/manifest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/k2d/manifest.yaml b/tools/k2d/manifest.yaml
index 0489491809..e8687c62a3 100644
--- a/tools/k2d/manifest.yaml
+++ b/tools/k2d/manifest.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml
 $schema: https://tools.uniget.dev/schema.yaml
 name: k2d
-version: "1.0.0-beta"
+version: "1.0.0"
 check: "" # No version parameter
 build_dependencies:
 - go