From 16851ae230a8330d9e0bdeead32bf9844afd3579 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 21 Dec 2023 14:55:35 +0100
Subject: [PATCH 01/10] Remove target for p* and q* #2213

---
 tools/packer/Dockerfile.template                 |  8 +++++---
 tools/pandoc/Dockerfile.template                 |  8 +++++---
 tools/paranoia/Dockerfile.template               |  8 +++++---
 tools/parca-agent/Dockerfile.template            |  8 +++++---
 tools/parca/Dockerfile.template                  |  8 +++++---
 tools/pass-audit/Dockerfile.template             | 12 +++++++-----
 tools/pass-git-helper/Dockerfile.template        | 12 +++++++-----
 tools/pass-import/Dockerfile.template            | 12 +++++++-----
 tools/pass-otp/Dockerfile.template               |  8 +++++---
 tools/pass-tail/Dockerfile.template              |  8 +++++---
 tools/pass-update/Dockerfile.template            |  8 +++++---
 tools/pass/Dockerfile.template                   | 10 ++++++----
 tools/passage/Dockerfile.template                | 10 ++++++----
 tools/passh/Dockerfile.template                  |  8 +++++---
 tools/patat/Dockerfile.template                  |  7 +++++--
 tools/pigz/Dockerfile.template                   |  8 +++++---
 tools/pipx/Dockerfile.template                   | 12 +++++++-----
 tools/podman-docker-shim/Dockerfile.template     |  7 +++++--
 tools/podman-tui/Dockerfile.template             | 10 ++++++----
 tools/podman/Dockerfile.template                 | 16 +++++++++-------
 tools/polaris/Dockerfile.template                |  8 +++++---
 tools/policy/Dockerfile.template                 |  8 +++++---
 tools/popeye/Dockerfile.template                 |  8 +++++---
 tools/portainer/Dockerfile.template              | 10 ++++++----
 tools/porter/Dockerfile.template                 |  8 +++++---
 tools/powerline-go/Dockerfile.template           |  8 +++++---
 tools/powershell/Dockerfile.template             |  8 +++++---
 tools/pre-commit/Dockerfile.template             | 12 +++++++-----
 tools/process-compose/Dockerfile.template        |  8 +++++---
 tools/procs/Dockerfile.template                  |  8 +++++---
 tools/promcolor/Dockerfile.template              |  8 +++++---
 tools/promql-cli/Dockerfile.template             |  8 +++++---
 tools/promtail/Dockerfile.template               |  8 +++++---
 tools/promtool/Dockerfile.template               | 10 ++++++----
 tools/proot/Dockerfile.template                  |  8 +++++---
 tools/proxify/Dockerfile.template                |  8 +++++---
 tools/pv/Dockerfile.template                     |  8 +++++---
 tools/pwru/Dockerfile.template                   |  8 +++++---
 .../python-build-standalone/Dockerfile.template  |  8 +++++---
 tools/python/Dockerfile.template                 |  8 +++++---
 tools/qemu/Dockerfile.template                   |  8 +++++---
 41 files changed, 224 insertions(+), 140 deletions(-)

diff --git a/tools/packer/Dockerfile.template b/tools/packer/Dockerfile.template
index 8bd471e2f..c5a185001 100644
--- a/tools/packer/Dockerfile.template
+++ b/tools/packer/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/pandoc/Dockerfile.template b/tools/pandoc/Dockerfile.template
index f4b9db058..a6bd8731d 100644
--- a/tools/pandoc/Dockerfile.template
+++ b/tools/pandoc/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/paranoia/Dockerfile.template b/tools/paranoia/Dockerfile.template
index 131458243..c17da0d9b 100644
--- a/tools/paranoia/Dockerfile.template
+++ b/tools/paranoia/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/parca-agent/Dockerfile.template b/tools/parca-agent/Dockerfile.template
index 3b38c31bf..d17ef6571 100644
--- a/tools/parca-agent/Dockerfile.template
+++ b/tools/parca-agent/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/parca/Dockerfile.template b/tools/parca/Dockerfile.template
index f5c02b681..22af6f1ef 100644
--- a/tools/parca/Dockerfile.template
+++ b/tools/parca/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/pass-audit/Dockerfile.template b/tools/pass-audit/Dockerfile.template
index faf7716a3..85f7a47aa 100644
--- a/tools/pass-audit/Dockerfile.template
+++ b/tools/pass-audit/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/pipx:latest AS pipx
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/pipx:${ref} AS pipx
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
 COPY --link --from=pipx / /
 RUN <<EOF
diff --git a/tools/pass-git-helper/Dockerfile.template b/tools/pass-git-helper/Dockerfile.template
index 712a5ac3d..25ba1de81 100644
--- a/tools/pass-git-helper/Dockerfile.template
+++ b/tools/pass-git-helper/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/pipx:latest AS pipx
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/pipx:${ref} AS pipx
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
 COPY --link --from=pipx / /
 RUN <<EOF
diff --git a/tools/pass-import/Dockerfile.template b/tools/pass-import/Dockerfile.template
index 3b3da47dc..8caf8866b 100644
--- a/tools/pass-import/Dockerfile.template
+++ b/tools/pass-import/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/pipx:latest AS pipx
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/pipx:${ref} AS pipx
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
 COPY --link --from=pipx / /
 RUN <<EOF
diff --git a/tools/pass-otp/Dockerfile.template b/tools/pass-otp/Dockerfile.template
index 42eec8eda..8e5c557f5 100644
--- a/tools/pass-otp/Dockerfile.template
+++ b/tools/pass-otp/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/pass-tail/Dockerfile.template b/tools/pass-tail/Dockerfile.template
index a1055106e..367906ae9 100644
--- a/tools/pass-tail/Dockerfile.template
+++ b/tools/pass-tail/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/pass-update/Dockerfile.template b/tools/pass-update/Dockerfile.template
index 06652755f..df58f9d38 100644
--- a/tools/pass-update/Dockerfile.template
+++ b/tools/pass-update/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/pass/Dockerfile.template b/tools/pass/Dockerfile.template
index 54662fa79..891cf178e 100644
--- a/tools/pass/Dockerfile.template
+++ b/tools/pass/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/make:latest AS make
 
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=make / /
 WORKDIR /tmp/pass
 ARG name
diff --git a/tools/passage/Dockerfile.template b/tools/passage/Dockerfile.template
index f804d54d2..21a9d93c6 100644
--- a/tools/passage/Dockerfile.template
+++ b/tools/passage/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/make:latest AS make
 
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=make / /
 WORKDIR /tmp/pass
 ARG name
diff --git a/tools/passh/Dockerfile.template b/tools/passh/Dockerfile.template
index e0b30fcbc..31a7c9987 100644
--- a/tools/passh/Dockerfile.template
+++ b/tools/passh/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM ubuntu:22.04 AS build
 RUN <<EOF
 apt-get update
@@ -21,7 +19,11 @@ make LDFLAGS=-static
 cp passh /usr/local/bin/
 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/passh ${prefix}${target}/bin/
\ No newline at end of file
diff --git a/tools/patat/Dockerfile.template b/tools/patat/Dockerfile.template
index be810e8fe..54e1e403b 100644
--- a/tools/patat/Dockerfile.template
+++ b/tools/patat/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
diff --git a/tools/pigz/Dockerfile.template b/tools/pigz/Dockerfile.template
index b7495c8de..f23c1bd68 100644
--- a/tools/pigz/Dockerfile.template
+++ b/tools/pigz/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM ubuntu:22.04 AS build
 RUN <<EOF
 apt-get update
@@ -26,7 +24,11 @@ cp pigz /opt/pigz/bin/
 cp pigz.1 /opt/pigz/share/man/man1/
 EOF
 
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 COPY --from=build /opt/pigz/ ${prefix}${target}/
\ No newline at end of file
diff --git a/tools/pipx/Dockerfile.template b/tools/pipx/Dockerfile.template
index 90994728d..7d1ed4b44 100644
--- a/tools/pipx/Dockerfile.template
+++ b/tools/pipx/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/shiv:latest AS shiv
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
 COPY --link --from=shiv / /
 RUN <<EOF
diff --git a/tools/podman-docker-shim/Dockerfile.template b/tools/podman-docker-shim/Dockerfile.template
index e8cd26cea..211cb7169 100644
--- a/tools/podman-docker-shim/Dockerfile.template
+++ b/tools/podman-docker-shim/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
diff --git a/tools/podman-tui/Dockerfile.template b/tools/podman-tui/Dockerfile.template
index a49a69ae7..ef524326d 100644
--- a/tools/podman-tui/Dockerfile.template
+++ b/tools/podman-tui/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go:latest AS go
 
-FROM ghcr.io/uniget-org/tools/go:${ref} AS go
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=go / /
 WORKDIR /go/src/github.com/containers/podman-tui
 ARG name
diff --git a/tools/podman/Dockerfile.template b/tools/podman/Dockerfile.template
index f39c98563..b7d8c885e 100644
--- a/tools/podman/Dockerfile.template
+++ b/tools/podman/Dockerfile.template
@@ -1,13 +1,15 @@
 #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-md2man:latest AS go-md2man
+FROM ghcr.io/uniget-org/tools/cni:latest AS cni
 
-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/go-md2man:${ref} AS go-md2man
-FROM ghcr.io/uniget-org/tools/cni:${ref} AS cni
-
-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 / /
 COPY --link --from=go-md2man / /
diff --git a/tools/polaris/Dockerfile.template b/tools/polaris/Dockerfile.template
index 5f63b8877..f6980dc51 100644
--- a/tools/polaris/Dockerfile.template
+++ b/tools/polaris/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/policy/Dockerfile.template b/tools/policy/Dockerfile.template
index 40a369aa9..587879595 100644
--- a/tools/policy/Dockerfile.template
+++ b/tools/policy/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/popeye/Dockerfile.template b/tools/popeye/Dockerfile.template
index 130fdc107..6a5ae4cdb 100644
--- a/tools/popeye/Dockerfile.template
+++ b/tools/popeye/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/portainer/Dockerfile.template b/tools/portainer/Dockerfile.template
index 4ed700bc4..46035c051 100644
--- a/tools/portainer/Dockerfile.template
+++ b/tools/portainer/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/docker-compose-v1:latest AS docker-compose-v1
 
-FROM ghcr.io/uniget-org/tools/docker-compose-v1:${ref} AS docker-compose-v1
-
-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 portainer.service ${prefix}${target}/etc/systemd/system/
diff --git a/tools/porter/Dockerfile.template b/tools/porter/Dockerfile.template
index fd606f70a..26de8261f 100644
--- a/tools/porter/Dockerfile.template
+++ b/tools/porter/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/powerline-go/Dockerfile.template b/tools/powerline-go/Dockerfile.template
index b663aac46..2aed35114 100644
--- a/tools/powerline-go/Dockerfile.template
+++ b/tools/powerline-go/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/powershell/Dockerfile.template b/tools/powershell/Dockerfile.template
index d865789a1..937532066 100644
--- a/tools/powershell/Dockerfile.template
+++ b/tools/powershell/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/pre-commit/Dockerfile.template b/tools/pre-commit/Dockerfile.template
index b21084971..dd4acdc44 100644
--- a/tools/pre-commit/Dockerfile.template
+++ b/tools/pre-commit/Dockerfile.template
@@ -1,11 +1,13 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/shiv:latest AS shiv
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 #COPY --link --from=python / /
diff --git a/tools/process-compose/Dockerfile.template b/tools/process-compose/Dockerfile.template
index 33b814e0d..26de056aa 100644
--- a/tools/process-compose/Dockerfile.template
+++ b/tools/process-compose/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/procs/Dockerfile.template b/tools/procs/Dockerfile.template
index 47136bd24..eea5f4053 100644
--- a/tools/procs/Dockerfile.template
+++ b/tools/procs/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/promcolor/Dockerfile.template b/tools/promcolor/Dockerfile.template
index a15deb704..47f99fa4f 100644
--- a/tools/promcolor/Dockerfile.template
+++ b/tools/promcolor/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/promql-cli/Dockerfile.template b/tools/promql-cli/Dockerfile.template
index 2d46c0d1e..7aeb097e3 100644
--- a/tools/promql-cli/Dockerfile.template
+++ b/tools/promql-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/promtail/Dockerfile.template b/tools/promtail/Dockerfile.template
index 195eac5d4..32ce02c91 100644
--- a/tools/promtail/Dockerfile.template
+++ b/tools/promtail/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/promtool/Dockerfile.template b/tools/promtool/Dockerfile.template
index a634aca4f..a5e871634 100644
--- a/tools/promtool/Dockerfile.template
+++ b/tools/promtool/Dockerfile.template
@@ -1,10 +1,12 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/go:latest AS go
 
-FROM ghcr.io/uniget-org/tools/go:${ref} AS go
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 COPY --link --from=go / /
 RUN <<EOF
 apt-get update
diff --git a/tools/proot/Dockerfile.template b/tools/proot/Dockerfile.template
index 2a77e2086..bcd51cd0d 100644
--- a/tools/proot/Dockerfile.template
+++ b/tools/proot/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/proxify/Dockerfile.template b/tools/proxify/Dockerfile.template
index e0af51aca..dba1b4d99 100644
--- a/tools/proxify/Dockerfile.template
+++ b/tools/proxify/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/pv/Dockerfile.template b/tools/pv/Dockerfile.template
index 57510ea00..08457e64d 100644
--- a/tools/pv/Dockerfile.template
+++ b/tools/pv/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/pwru/Dockerfile.template b/tools/pwru/Dockerfile.template
index 8d9562454..e967bbf4d 100644
--- a/tools/pwru/Dockerfile.template
+++ b/tools/pwru/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/python-build-standalone/Dockerfile.template b/tools/python-build-standalone/Dockerfile.template
index e2b4b9ed5..e5b3fae99 100644
--- a/tools/python-build-standalone/Dockerfile.template
+++ b/tools/python-build-standalone/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/python/Dockerfile.template b/tools/python/Dockerfile.template
index e2b4b9ed5..e5b3fae99 100644
--- a/tools/python/Dockerfile.template
+++ b/tools/python/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/qemu/Dockerfile.template b/tools/qemu/Dockerfile.template
index 95c88e07c..50524181f 100644
--- a/tools/qemu/Dockerfile.template
+++ b/tools/qemu/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
 ENV DEBIAN_FRONTEND=non-interactive

From 401a1a029d0b254d7c5d74ec018bcedda15a414a Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 15:28:50 +0100
Subject: [PATCH 02/10] Removed target var #2213

---
 tools/packer/Dockerfile.template              |  4 ++--
 tools/pandoc/Dockerfile.template              |  2 +-
 tools/paranoia/Dockerfile.template            | 10 ++++-----
 tools/parca-agent/Dockerfile.template         |  2 +-
 tools/parca/Dockerfile.template               |  2 +-
 tools/pass-audit/Dockerfile.template          | 20 ++++++++---------
 tools/pass-git-helper/Dockerfile.template     |  8 +++----
 tools/pass-import/Dockerfile.template         | 20 ++++++++---------
 tools/pass-otp/Dockerfile.template            |  4 ++--
 tools/pass-tail/Dockerfile.template           |  4 ++--
 tools/pass-update/Dockerfile.template         |  6 ++---
 tools/pass/Dockerfile.template                |  8 +++----
 tools/passage/Dockerfile.template             |  8 +++----
 tools/passh/Dockerfile.template               |  2 +-
 tools/patat/Dockerfile.template               |  4 ++--
 tools/pigz/Dockerfile.template                |  2 +-
 tools/pipx/Dockerfile.template                |  8 +++----
 tools/podman-docker-shim/Dockerfile.template  |  4 ++--
 tools/podman-tui/Dockerfile.template          |  2 +-
 tools/podman/Dockerfile.template              | 22 +++++++++----------
 tools/polaris/Dockerfile.template             |  2 +-
 tools/policy/Dockerfile.template              |  2 +-
 tools/popeye/Dockerfile.template              |  8 +++----
 tools/portainer/Dockerfile.template           | 12 +++++-----
 tools/porter/Dockerfile.template              | 10 ++++-----
 tools/powerline-go/Dockerfile.template        |  4 ++--
 tools/powershell/Dockerfile.template          |  6 ++---
 tools/pre-commit/Dockerfile.template          |  2 +-
 tools/process-compose/Dockerfile.template     |  8 +++----
 tools/procs/Dockerfile.template               |  8 +++----
 tools/promcolor/Dockerfile.template           |  8 +++----
 tools/promql-cli/Dockerfile.template          |  2 +-
 tools/promtail/Dockerfile.template            |  4 ++--
 tools/promtool/Dockerfile.template            |  8 +++----
 tools/proot/Dockerfile.template               |  2 +-
 tools/proxify/Dockerfile.template             |  2 +-
 tools/pv/Dockerfile.template                  |  2 +-
 tools/pwru/Dockerfile.template                |  2 +-
 .../Dockerfile.template                       |  2 +-
 tools/python/Dockerfile.template              |  2 +-
 40 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/tools/packer/Dockerfile.template b/tools/packer/Dockerfile.template
index c5a185001..ee6c78b8e 100644
--- a/tools/packer/Dockerfile.template
+++ b/tools/packer/Dockerfile.template
@@ -11,6 +11,6 @@ RUN <<EOF
 url="https://releases.hashicorp.com/packer/${version}/packer_${version}_linux_${alt_arch}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/bin" "${filename}"
-echo "complete -C ${target}/bin/packer packer" >"${prefix}${target}/etc/profile.d/packer.sh"
+unzip -q -o -d "${prefix}/bin" "${filename}"
+echo "complete -C /bin/packer packer" >"${prefix}/etc/profile.d/packer.sh"
 EOF
\ No newline at end of file
diff --git a/tools/pandoc/Dockerfile.template b/tools/pandoc/Dockerfile.template
index a6bd8731d..52906ea12 100644
--- a/tools/pandoc/Dockerfile.template
+++ b/tools/pandoc/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "jgm/pandoc" "${version}" "pandoc-${version}-linux-amd64.tar.gz"
 curl --silent --location --fail "https://github.com/jgm/pandoc/releases/download/${version}/pandoc-${version}-linux-amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}" --strip-components=1 --no-same-owner
+| tar --extract --gzip --directory="${prefix}" --strip-components=1 --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/paranoia/Dockerfile.template b/tools/paranoia/Dockerfile.template
index c17da0d9b..a17d20cde 100644
--- a/tools/paranoia/Dockerfile.template
+++ b/tools/paranoia/Dockerfile.template
@@ -9,11 +9,11 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "jetstack/paranoia" "v${version}" "paranoia-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/paranoia" \
+curl --silent --location --fail --output "${prefix}/bin/paranoia" \
     "https://github.com/jetstack/paranoia/releases/download/v${version}/paranoia-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/paranoia"
+chmod +x "${prefix}/bin/paranoia"
 
-"${prefix}${target}/bin/paranoia" completion bash >"${prefix}${target}/share/bash-completion/completions/paranoia"
-"${prefix}${target}/bin/paranoia" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/paranoia.fish"
-"${prefix}${target}/bin/paranoia" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_paranoia"
+"${prefix}/bin/paranoia" completion bash >"${prefix}/share/bash-completion/completions/paranoia"
+"${prefix}/bin/paranoia" completion fish >"${prefix}/share/fish/vendor_completions.d/paranoia.fish"
+"${prefix}/bin/paranoia" completion zsh >"${prefix}/share/zsh/vendor-completions/_paranoia"
 EOF
diff --git a/tools/parca-agent/Dockerfile.template b/tools/parca-agent/Dockerfile.template
index d17ef6571..c9059c830 100644
--- a/tools/parca-agent/Dockerfile.template
+++ b/tools/parca-agent/Dockerfile.template
@@ -12,6 +12,6 @@ check-github-release-asset "parca-dev/parca-agent" "v${version}" "parca-agent_${
 
 echo "### Downloading parca-agent ${version}"
 curl --silent --location --fail "https://github.com/parca-dev/parca-agent/releases/download/v${version}/parca-agent_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     parca-agent
 EOF
\ No newline at end of file
diff --git a/tools/parca/Dockerfile.template b/tools/parca/Dockerfile.template
index 22af6f1ef..112787915 100644
--- a/tools/parca/Dockerfile.template
+++ b/tools/parca/Dockerfile.template
@@ -23,6 +23,6 @@ esac
 
 check-github-release-asset "parca-dev/parca" "v${version}" "parca_${version}_Linux_${arch_suffix}.tar.gz"
 curl --silent --location --fail "https://github.com/parca-dev/parca/releases/download/v${version}/parca_${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 \
     parca
 EOF
\ No newline at end of file
diff --git a/tools/pass-audit/Dockerfile.template b/tools/pass-audit/Dockerfile.template
index 85f7a47aa..5d1d34ef7 100644
--- a/tools/pass-audit/Dockerfile.template
+++ b/tools/pass-audit/Dockerfile.template
@@ -17,8 +17,8 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-ENV PIPX_HOME=${prefix}${target}/libexec/pipx \
-    PIPX_BIN_DIR=${prefix}${target}/bin
+ENV PIPX_HOME=${prefix}/libexec/pipx \
+    PIPX_BIN_DIR=${prefix}/bin
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -35,20 +35,20 @@ curl --silent --location --fail "https://github.com/roddhjav/pass-audit/releases
 | tar --extract --gzip --strip-components=1 --no-same-owner
 patch </tmp/setup.cfg.patch
 pipx install .
-ln --symbolic --relative --force "${prefix}${target}/libexec/pipx/venvs/pass-audit/bin/paudit" "${prefix}${target}/bin/paudit"
-sed -i "s|#\!${prefix}/|#\!/|" "${prefix}${target}/libexec/pipx/venvs/pass-audit/bin/paudit"
+ln --symbolic --relative --force "${prefix}/libexec/pipx/venvs/pass-audit/bin/paudit" "${prefix}/bin/paudit"
+sed -i "s|#\!${prefix}/|#\!/|" "${prefix}/libexec/pipx/venvs/pass-audit/bin/paudit"
 EOF
 RUN <<EOF
-mkdir -p "${prefix}${target}/lib/password-store/extensions/"
-mv audit.bash "${prefix}${target}/lib/password-store/extensions/"
-sed -i 's/python3 -m pass_audit/paudit/g' "${prefix}${target}/lib/password-store/extensions/audit.bash"
+mkdir -p "${prefix}/lib/password-store/extensions/"
+mv audit.bash "${prefix}/lib/password-store/extensions/"
+sed -i 's/python3 -m pass_audit/paudit/g' "${prefix}/lib/password-store/extensions/audit.bash"
 mv \
     share/man/man1/pass-audit.1 \
-    "${prefix}${target}/share/man/man1/"
+    "${prefix}/share/man/man1/"
 mv \
     share/bash-completion/completions/pass-audit \
-    "${prefix}${target}/share/bash-completion/completions/"
+    "${prefix}/share/bash-completion/completions/"
 mv \
     share/zsh/site-functions/_pass-audit \
-    "${prefix}${target}/share/zsh/vendor-completions/"
+    "${prefix}/share/zsh/vendor-completions/"
 EOF
\ No newline at end of file
diff --git a/tools/pass-git-helper/Dockerfile.template b/tools/pass-git-helper/Dockerfile.template
index 25ba1de81..05459c51c 100644
--- a/tools/pass-git-helper/Dockerfile.template
+++ b/tools/pass-git-helper/Dockerfile.template
@@ -17,8 +17,8 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-ENV PIPX_HOME=${prefix}${target}/libexec/pipx \
-    PIPX_BIN_DIR=${prefix}${target}/bin
+ENV PIPX_HOME=${prefix}/libexec/pipx \
+    PIPX_BIN_DIR=${prefix}/bin
 WORKDIR /tmp/pass-git-helper
 ARG name
 ARG version
@@ -26,6 +26,6 @@ RUN <<EOF
 curl --silent --location --fail "https://github.com/languitar/pass-git-helper/archive/refs/tags/v${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1 --no-same-owner
 pipx install .
-ln --symbolic --relative --force "${prefix}${target}/libexec/pipx/venvs/pass-git-helper/bin/pass-git-helper" "${prefix}${target}/bin/pass-git-helper"
-sed -i "s|#\!${prefix}/|#\!/|" "${prefix}${target}/libexec/pipx/venvs/pass-git-helper/bin/pass-git-helper"
+ln --symbolic --relative --force "${prefix}/libexec/pipx/venvs/pass-git-helper/bin/pass-git-helper" "${prefix}/bin/pass-git-helper"
+sed -i "s|#\!${prefix}/|#\!/|" "${prefix}/libexec/pipx/venvs/pass-git-helper/bin/pass-git-helper"
 EOF
diff --git a/tools/pass-import/Dockerfile.template b/tools/pass-import/Dockerfile.template
index 8caf8866b..df171d335 100644
--- a/tools/pass-import/Dockerfile.template
+++ b/tools/pass-import/Dockerfile.template
@@ -17,14 +17,14 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-ENV PIPX_HOME=${prefix}${target}/libexec/pipx \
-    PIPX_BIN_DIR=${prefix}${target}/bin
+ENV PIPX_HOME=${prefix}/libexec/pipx \
+    PIPX_BIN_DIR=${prefix}/bin
 ARG name
 ARG version
 RUN <<EOF
 pipx install pass-import
-ln --symbolic --relative --force "${prefix}${target}/libexec/pipx/venvs/pass-import/bin/pimport" "${prefix}${target}/bin/pimport"
-sed -i "s|#\!${prefix}/|#\!/|" "${prefix}${target}/libexec/pipx/venvs/pass-import/bin/pimport"
+ln --symbolic --relative --force "${prefix}/libexec/pipx/venvs/pass-import/bin/pimport" "${prefix}/bin/pimport"
+sed -i "s|#\!${prefix}/|#\!/|" "${prefix}/libexec/pipx/venvs/pass-import/bin/pimport"
 EOF
 WORKDIR /tmp
 RUN <<EOF
@@ -35,19 +35,19 @@ curl --silent --location --fail "https://github.com/roddhjav/pass-import/release
     pass-import-${version}/share/man/man1 \
     pass-import-${version}/share/bash-completion \
     pass-import-${version}/share/zsh/site-functions
-mkdir -p "${prefix}${target}/lib/password-store/extensions/"
-mv import.bash "${prefix}${target}/lib/password-store/extensions/"
-sed -i 's/python3 -m pass_import/pimport/g' "${prefix}${target}/lib/password-store/extensions/import.bash"
+mkdir -p "${prefix}/lib/password-store/extensions/"
+mv import.bash "${prefix}/lib/password-store/extensions/"
+sed -i 's/python3 -m pass_import/pimport/g' "${prefix}/lib/password-store/extensions/import.bash"
 mv \
     share/man/man1/pimport.1 \
     share/man/man1/pass-import.1 \
-    "${prefix}${target}/share/man/man1/"
+    "${prefix}/share/man/man1/"
 mv \
     share/bash-completion/completions/pass-import \
     share/bash-completion/completions/pimport \
-    "${prefix}${target}/share/bash-completion/completions/"
+    "${prefix}/share/bash-completion/completions/"
 mv \
     share/zsh/site-functions/_pass-import \
     share/zsh/site-functions/_pimport \
-    "${prefix}${target}/share/zsh/vendor-completions/"
+    "${prefix}/share/zsh/vendor-completions/"
 EOF
\ No newline at end of file
diff --git a/tools/pass-otp/Dockerfile.template b/tools/pass-otp/Dockerfile.template
index 8e5c557f5..8aa63d3df 100644
--- a/tools/pass-otp/Dockerfile.template
+++ b/tools/pass-otp/Dockerfile.template
@@ -19,6 +19,6 @@ curl --silent --location --fail "https://github.com/tadfisher/pass-otp/releases/
 | tar --extract --gzip --strip-components=1 --no-same-owner
 make install \
     DESTDIR="${prefix}" \
-    PREFIX="${target}" \
-    BASHCOMPDIR="${target}/share/bash-completion/completions"
+    PREFIX="" \
+    BASHCOMPDIR="/share/bash-completion/completions"
 EOF
\ No newline at end of file
diff --git a/tools/pass-tail/Dockerfile.template b/tools/pass-tail/Dockerfile.template
index 367906ae9..81a12cd06 100644
--- a/tools/pass-tail/Dockerfile.template
+++ b/tools/pass-tail/Dockerfile.template
@@ -18,6 +18,6 @@ curl --silent --location --fail "https://github.com/palortoff/pass-extension-tai
 | tar --extract --gzip --strip-components=1 --no-same-owner
 make install \
     DESTDIR="${prefix}" \
-    PREFIX="${target}" \
-    BASHCOMPDIR="${target}/share/bash-completion/completions"
+    PREFIX="" \
+    BASHCOMPDIR="/share/bash-completion/completions"
 EOF
\ No newline at end of file
diff --git a/tools/pass-update/Dockerfile.template b/tools/pass-update/Dockerfile.template
index df58f9d38..6202e7f6c 100644
--- a/tools/pass-update/Dockerfile.template
+++ b/tools/pass-update/Dockerfile.template
@@ -19,7 +19,7 @@ curl --silent --location --fail "https://github.com/roddhjav/pass-update/release
 | tar --extract --gzip --strip-components=1 --no-same-owner
 make install \
     DESTDIR="${prefix}" \
-    PREFIX="${target}" \
-    BASHCOMPDIR="${target}/share/bash-completion/completions" \
-    ZSHCOMPDIR="${target}/share/zsh/vendor-completions"
+    PREFIX="" \
+    BASHCOMPDIR="/share/bash-completion/completions" \
+    ZSHCOMPDIR="/share/zsh/vendor-completions"
 EOF
\ No newline at end of file
diff --git a/tools/pass/Dockerfile.template b/tools/pass/Dockerfile.template
index 891cf178e..e73e495ac 100644
--- a/tools/pass/Dockerfile.template
+++ b/tools/pass/Dockerfile.template
@@ -17,9 +17,9 @@ curl --silent --location --fail "https://git.zx2c4.com/password-store/snapshot/p
 | tar --extract --xz --strip-components=1 --no-same-owner
 make install \
     DESTDIR="${prefix}" \
-    PREFIX="${target}" \
+    PREFIX="" \
     WITH_ALLCOMP="yes" \
-    BASHCOMPDIR="${target}/share/bash-completion/completions" \
-    FISHCOMPDIR="${target}/share/fish/vendor_completions.d" \
-    ZSHCOMPDIR="${target}/share/zsh/vendor-completions"
+    BASHCOMPDIR="/share/bash-completion/completions" \
+    FISHCOMPDIR="/share/fish/vendor_completions.d" \
+    ZSHCOMPDIR="/share/zsh/vendor-completions"
 EOF
\ No newline at end of file
diff --git a/tools/passage/Dockerfile.template b/tools/passage/Dockerfile.template
index 21a9d93c6..c69bbd76f 100644
--- a/tools/passage/Dockerfile.template
+++ b/tools/passage/Dockerfile.template
@@ -17,9 +17,9 @@ unzip main.zip
 cd passage-main
 make install \
     DESTDIR="${prefix}" \
-    PREFIX="${target}" \
+    PREFIX="" \
     WITH_ALLCOMP="yes" \
-    BASHCOMPDIR="${target}/share/bash-completion/completions" \
-    FISHCOMPDIR="${target}/share/fish/vendor_completions.d" \
-    ZSHCOMPDIR="${target}/share/zsh/vendor-completions"
+    BASHCOMPDIR="/share/bash-completion/completions" \
+    FISHCOMPDIR="/share/fish/vendor_completions.d" \
+    ZSHCOMPDIR="/share/zsh/vendor-completions"
 EOF
\ No newline at end of file
diff --git a/tools/passh/Dockerfile.template b/tools/passh/Dockerfile.template
index 31a7c9987..715630a8e 100644
--- a/tools/passh/Dockerfile.template
+++ b/tools/passh/Dockerfile.template
@@ -26,4 +26,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/passh ${prefix}${target}/bin/
\ No newline at end of file
+COPY --from=build /usr/local/bin/passh ${prefix}/bin/
\ No newline at end of file
diff --git a/tools/patat/Dockerfile.template b/tools/patat/Dockerfile.template
index 54e1e403b..23cd0c1a3 100644
--- a/tools/patat/Dockerfile.template
+++ b/tools/patat/Dockerfile.template
@@ -12,10 +12,10 @@ ARG version
 RUN <<EOF
 check-github-release-asset "jaspervdj/patat" "v${version}" "patat-v${version}-linux-${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jaspervdj/patat/releases/download/v${version}/patat-v${version}-linux-${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 \
     patat-v${version}-linux-${arch}/patat
 
 curl --silent --location --fail "https://github.com/jaspervdj/patat/releases/download/v${version}/patat-v${version}-linux-${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/share/man/man1" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/share/man/man1" --strip-components=1 --no-same-owner \
     patat-v${version}-linux-${arch}/patat.1
 EOF
\ No newline at end of file
diff --git a/tools/pigz/Dockerfile.template b/tools/pigz/Dockerfile.template
index f23c1bd68..dc02db180 100644
--- a/tools/pigz/Dockerfile.template
+++ b/tools/pigz/Dockerfile.template
@@ -31,4 +31,4 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=build /opt/pigz/ ${prefix}${target}/
\ No newline at end of file
+COPY --from=build /opt/pigz/ ${prefix}/
\ No newline at end of file
diff --git a/tools/pipx/Dockerfile.template b/tools/pipx/Dockerfile.template
index 7d1ed4b44..1955fcefe 100644
--- a/tools/pipx/Dockerfile.template
+++ b/tools/pipx/Dockerfile.template
@@ -20,9 +20,9 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/pipx" --console-script pipx "pipx==${version}"
+shiv --output-file "${prefix}/bin/pipx" --console-script pipx "pipx==${version}"
 
-#register-python-argcomplete              pipx >"${prefix}${target}/share/bash-completion/completions/pipx"
-#register-python-argcomplete --shell fish pipx >"${prefix}${target}/share/fish/vendor_completions.d/pipx.fish"
-#register-python-argcomplete              pipx >"${prefix}${target}/share/zsh/vendor-completions/_pipx"
+#register-python-argcomplete              pipx >"${prefix}/share/bash-completion/completions/pipx"
+#register-python-argcomplete --shell fish pipx >"${prefix}/share/fish/vendor_completions.d/pipx.fish"
+#register-python-argcomplete              pipx >"${prefix}/share/zsh/vendor-completions/_pipx"
 EOF
diff --git a/tools/podman-docker-shim/Dockerfile.template b/tools/podman-docker-shim/Dockerfile.template
index 211cb7169..817e8169e 100644
--- a/tools/podman-docker-shim/Dockerfile.template
+++ b/tools/podman-docker-shim/Dockerfile.template
@@ -9,7 +9,7 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 
-COPY docker ${prefix}${target}/libexec/podman/
+COPY docker ${prefix}/libexec/podman/
 RUN <<EOF
-ln --symbolic --relative --force "${prefix}${target}/libexec/podman/docker" "${target}/bin/docker"
+ln --symbolic --relative --force "${prefix}/libexec/podman/docker" "/bin/docker"
 EOF
\ No newline at end of file
diff --git a/tools/podman-tui/Dockerfile.template b/tools/podman-tui/Dockerfile.template
index ef524326d..cfe2f3ca9 100644
--- a/tools/podman-tui/Dockerfile.template
+++ b/tools/podman-tui/Dockerfile.template
@@ -15,5 +15,5 @@ RUN <<EOF
 export CGO_ENABLED=0
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/containers/podman-tui .
 go build -mod=vendor -o ./bin/linux/podman-tui -tags "containers_image_openpgp remote"
-cp ./bin/linux/podman-tui "${prefix}${target}/bin/"
+cp ./bin/linux/podman-tui "${prefix}/bin/"
 EOF
diff --git a/tools/podman/Dockerfile.template b/tools/podman/Dockerfile.template
index b7d8c885e..98c214fc3 100644
--- a/tools/podman/Dockerfile.template
+++ b/tools/podman/Dockerfile.template
@@ -44,20 +44,20 @@ EOF
 RUN git clone --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/containers/podman .
 RUN make EXTRA_LDFLAGS="-s -w -extldflags=-static"
 RUN <<EOF
-make install DESTDIR="${prefix}" PREFIX="${target}"
+make install DESTDIR="${prefix}" PREFIX=""
 mkdir -p \
-    "${prefix}${target}/share/bash-completion/completions" \
-    "${prefix}${target}/share/fish/vendor_completions.d" \
-    "${prefix}${target}/share/zsh/vendor-completions"
+    "${prefix}/share/bash-completion/completions" \
+    "${prefix}/share/fish/vendor_completions.d" \
+    "${prefix}/share/zsh/vendor-completions"
 EOF
 RUN <<EOF
-cp completions/bash/podman "${prefix}${target}/share/bash-completion/completions/podman"
-cp completions/fish/podman.fish "${prefix}${target}/share/fish/vendor_completions.d/podman.fish"
-cp completions/zsh/_podman "${prefix}${target}/share/zsh/vendor-completions/_podman"
-cp "${prefix}${target}/lib/systemd/system/podman.service" "${prefix}${target}/etc/systemd/system/"
-cp "${prefix}${target}/lib/systemd/system/podman.socket" "${prefix}${target}/etc/systemd/system/"
+cp completions/bash/podman "${prefix}/share/bash-completion/completions/podman"
+cp completions/fish/podman.fish "${prefix}/share/fish/vendor_completions.d/podman.fish"
+cp completions/zsh/_podman "${prefix}/share/zsh/vendor-completions/_podman"
+cp "${prefix}/lib/systemd/system/podman.service" "${prefix}/etc/systemd/system/"
+cp "${prefix}/lib/systemd/system/podman.socket" "${prefix}/etc/systemd/system/"
 
-mkdir -p "${prefix}${target}/lib/tmpfiles.d"
-curl --silent --location --fail --output "${prefix}${target}/lib/tmpfiles.d/podman-docker.conf" \
+mkdir -p "${prefix}/lib/tmpfiles.d"
+curl --silent --location --fail --output "${prefix}/lib/tmpfiles.d/podman-docker.conf" \
     "https://github.com/containers/podman/raw/v${version}/contrib/systemd/system/podman-docker.conf"
 EOF
\ No newline at end of file
diff --git a/tools/polaris/Dockerfile.template b/tools/polaris/Dockerfile.template
index f6980dc51..6a1fce29e 100644
--- a/tools/polaris/Dockerfile.template
+++ b/tools/polaris/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "FairwindsOps/polaris" "${version}" "polaris_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/FairwindsOps/polaris/releases/download/${version}/polaris_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     polaris
 EOF
\ No newline at end of file
diff --git a/tools/policy/Dockerfile.template b/tools/policy/Dockerfile.template
index 587879595..1d36e3232 100644
--- a/tools/policy/Dockerfile.template
+++ b/tools/policy/Dockerfile.template
@@ -27,5 +27,5 @@ check-github-release-asset "opcr-io/policy" "v${version}" "policy${version}_linu
 url="https://github.com/opcr-io/policy/releases/download/v${version}/policy${version}_linux_${arch_suffix}.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}"
 EOF
diff --git a/tools/popeye/Dockerfile.template b/tools/popeye/Dockerfile.template
index 6a5ae4cdb..bf3d37699 100644
--- a/tools/popeye/Dockerfile.template
+++ b/tools/popeye/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "derailed/popeye" "v${version}" "popeye_Linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/derailed/popeye/releases/download/v${version}/popeye_Linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     popeye
-"${prefix}${target}/bin/popeye" completion bash >"${prefix}${target}/share/bash-completion/completions/popeye"
-"${prefix}${target}/bin/popeye" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/popeye.fish"
-"${prefix}${target}/bin/popeye" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_popeye"
+"${prefix}/bin/popeye" completion bash >"${prefix}/share/bash-completion/completions/popeye"
+"${prefix}/bin/popeye" completion fish >"${prefix}/share/fish/vendor_completions.d/popeye.fish"
+"${prefix}/bin/popeye" completion zsh >"${prefix}/share/zsh/vendor-completions/_popeye"
 EOF
\ No newline at end of file
diff --git a/tools/portainer/Dockerfile.template b/tools/portainer/Dockerfile.template
index 46035c051..b0b7bef87 100644
--- a/tools/portainer/Dockerfile.template
+++ b/tools/portainer/Dockerfile.template
@@ -9,17 +9,17 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY portainer.service ${prefix}${target}/etc/systemd/system/
-COPY init-portainer ${prefix}${target}/etc/init.d/portainer
+COPY portainer.service ${prefix}/etc/systemd/system/
+COPY init-portainer ${prefix}/etc/init.d/portainer
 RUN <<EOF
 check-github-release-asset "portainer/portainer" "${version}" "portainer-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/portainer/portainer/releases/download/${version}/portainer-${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 \
     portainer/portainer
 
-mkdir -p "${prefix}${target}/share/portainer"
+mkdir -p "${prefix}/share/portainer"
 curl --silent --location --fail "https://github.com/portainer/portainer/releases/download/${version}/portainer-${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/share/portainer" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/share/portainer" --strip-components=1 --no-same-owner \
     portainer/public
 EOF
-COPY --from=docker-compose-v1 ${target}/bin/docker-compose ${prefix}${target}/bin/
+COPY --from=docker-compose-v1 /bin/docker-compose ${prefix}/bin/
diff --git a/tools/porter/Dockerfile.template b/tools/porter/Dockerfile.template
index 26de8261f..17846faaa 100644
--- a/tools/porter/Dockerfile.template
+++ b/tools/porter/Dockerfile.template
@@ -9,10 +9,10 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "getporter/porter" "v${version}" "porter-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/porter" \
+curl --silent --location --fail --output "${prefix}/bin/porter" \
     "https://github.com/getporter/porter/releases/download/v${version}/porter-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/porter"
-"${prefix}${target}/bin/porter" completion bash >"${prefix}${target}/share/bash-completion/completions/porter"
-"${prefix}${target}/bin/porter" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/porter.fish"
-"${prefix}${target}/bin/porter" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_porter"
+chmod +x "${prefix}/bin/porter"
+"${prefix}/bin/porter" completion bash >"${prefix}/share/bash-completion/completions/porter"
+"${prefix}/bin/porter" completion fish >"${prefix}/share/fish/vendor_completions.d/porter.fish"
+"${prefix}/bin/porter" completion zsh >"${prefix}/share/zsh/vendor-completions/_porter"
 EOF
\ No newline at end of file
diff --git a/tools/powerline-go/Dockerfile.template b/tools/powerline-go/Dockerfile.template
index 2aed35114..9a2da6b03 100644
--- a/tools/powerline-go/Dockerfile.template
+++ b/tools/powerline-go/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "justjanne/powerline-go" "v${version}" "powerline-go-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/powerline-go" \
+curl --silent --location --fail --output "${prefix}/bin/powerline-go" \
     "https://github.com/justjanne/powerline-go/releases/download/v${version}/powerline-go-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/powerline-go"
+chmod +x "${prefix}/bin/powerline-go"
 EOF
\ No newline at end of file
diff --git a/tools/powershell/Dockerfile.template b/tools/powershell/Dockerfile.template
index 937532066..238e4f372 100644
--- a/tools/powershell/Dockerfile.template
+++ b/tools/powershell/Dockerfile.template
@@ -18,7 +18,7 @@ apt-get update
 apt-cache madison powershell
 apt-get -y install --no-install-recommends \
     powershell=${version}-*
-mkdir -p "${prefix}${target}/opt/microsoft"
-mv /opt/microsoft/ "${prefix}${target}/opt/"
-ln --symbolic --relative --force "${prefix}${target}/opt/microsoft/powershell/7/pwsh" "${prefix}${target}/bin/pwsh"
+mkdir -p "${prefix}/opt/microsoft"
+mv /opt/microsoft/ "${prefix}/opt/"
+ln --symbolic --relative --force "${prefix}/opt/microsoft/powershell/7/pwsh" "${prefix}/bin/pwsh"
 EOF
\ No newline at end of file
diff --git a/tools/pre-commit/Dockerfile.template b/tools/pre-commit/Dockerfile.template
index dd4acdc44..6908d4e98 100644
--- a/tools/pre-commit/Dockerfile.template
+++ b/tools/pre-commit/Dockerfile.template
@@ -20,5 +20,5 @@ apt-get -y install --no-install-recommends \
     python-is-python3
 EOF
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/pre-commit" --console-script pre-commit "pre-commit==${version}"
+shiv --output-file "${prefix}/bin/pre-commit" --console-script pre-commit "pre-commit==${version}"
 EOF
\ No newline at end of file
diff --git a/tools/process-compose/Dockerfile.template b/tools/process-compose/Dockerfile.template
index 26de056aa..8fbde8f75 100644
--- a/tools/process-compose/Dockerfile.template
+++ b/tools/process-compose/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "F1bonacc1/process-compose" "v${version}" "process-compose_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/F1bonacc1/process-compose/releases/download/v${version}/process-compose_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 
-"${prefix}${target}/bin/process-compose" completion bash >"${prefix}${target}/share/bash-completion/completions/process-compose"
-"${prefix}${target}/bin/process-compose" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/process-compose.fish"
-"${prefix}${target}/bin/process-compose" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_process-compose"
+"${prefix}/bin/process-compose" completion bash >"${prefix}/share/bash-completion/completions/process-compose"
+"${prefix}/bin/process-compose" completion fish >"${prefix}/share/fish/vendor_completions.d/process-compose.fish"
+"${prefix}/bin/process-compose" completion zsh >"${prefix}/share/zsh/vendor-completions/_process-compose"
 EOF
\ No newline at end of file
diff --git a/tools/procs/Dockerfile.template b/tools/procs/Dockerfile.template
index eea5f4053..52593520a 100644
--- a/tools/procs/Dockerfile.template
+++ b/tools/procs/Dockerfile.template
@@ -12,8 +12,8 @@ check-github-release-asset "dalance/procs" "v${version}" "procs-v${version}-${ar
 url="https://github.com/dalance/procs/releases/download/v${version}/procs-v${version}-${arch}-linux.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/bin" "${filename}"
-"${prefix}${target}/bin/procs" --gen-completion-out bash >"${prefix}${target}/share/bash-completion/completions/procs"
-"${prefix}${target}/bin/procs" --gen-completion-out fish >"${prefix}${target}/share/fish/vendor_completions.d/procs.fish"
-"${prefix}${target}/bin/procs" --gen-completion-out zsh >"${prefix}${target}/share/zsh/vendor-completions/_procs"
+unzip -q -o -d "${prefix}/bin" "${filename}"
+"${prefix}/bin/procs" --gen-completion-out bash >"${prefix}/share/bash-completion/completions/procs"
+"${prefix}/bin/procs" --gen-completion-out fish >"${prefix}/share/fish/vendor_completions.d/procs.fish"
+"${prefix}/bin/procs" --gen-completion-out zsh >"${prefix}/share/zsh/vendor-completions/_procs"
 EOF
diff --git a/tools/promcolor/Dockerfile.template b/tools/promcolor/Dockerfile.template
index 47f99fa4f..78f3f94b1 100644
--- a/tools/promcolor/Dockerfile.template
+++ b/tools/promcolor/Dockerfile.template
@@ -10,13 +10,13 @@ ARG version
 RUN <<EOF
 check-github-release-asset "fhemberger/promcolor" "v${version}" "promcolor_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/fhemberger/promcolor/releases/download/v${version}/promcolor_${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 \
     promcolor
 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/promql-cli/Dockerfile.template b/tools/promql-cli/Dockerfile.template
index 7aeb097e3..afc0936a0 100644
--- a/tools/promql-cli/Dockerfile.template
+++ b/tools/promql-cli/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "nalbury/promql-cli" "v${version}" "promql-v${version}-linux-amd64.tar.gz"
 curl --silent --location --fail "https://github.com/nalbury/promql-cli/releases/download/v${version}/promql-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/promtail/Dockerfile.template b/tools/promtail/Dockerfile.template
index 32ce02c91..2c8b0cf99 100644
--- a/tools/promtail/Dockerfile.template
+++ b/tools/promtail/Dockerfile.template
@@ -12,6 +12,6 @@ check-github-release-asset "grafana/loki" "v${version}" "promtail-linux-${alt_ar
 url="https://github.com/grafana/loki/releases/download/v${version}/promtail-linux-${alt_arch}.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/bin" "${filename}"
-mv "${prefix}${target}/bin/promtail-linux-${alt_arch}" "${prefix}${target}/bin/promtail"
+unzip -q -o -d "${prefix}/bin" "${filename}"
+mv "${prefix}/bin/promtail-linux-${alt_arch}" "${prefix}/bin/promtail"
 EOF
\ No newline at end of file
diff --git a/tools/promtool/Dockerfile.template b/tools/promtool/Dockerfile.template
index a5e871634..9d23a2a5c 100644
--- a/tools/promtool/Dockerfile.template
+++ b/tools/promtool/Dockerfile.template
@@ -19,12 +19,12 @@ ARG version
 RUN <<EOF
 check-clone "https://github.com/prometheus/prometheus" "v${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/prometheus/prometheus .
-go build -o "${prefix}${target}/bin/promtool" ./cmd/promtool
+go build -o "${prefix}/bin/promtool" ./cmd/promtool
 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/proot/Dockerfile.template b/tools/proot/Dockerfile.template
index bcd51cd0d..8a317c665 100644
--- a/tools/proot/Dockerfile.template
+++ b/tools/proot/Dockerfile.template
@@ -19,5 +19,5 @@ WORKDIR /tmp/proot
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/proot-me/proot .
 make -C src
-cp src/proot "${prefix}${target}/bin/"
+cp src/proot "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/proxify/Dockerfile.template b/tools/proxify/Dockerfile.template
index dba1b4d99..6127ac87a 100644
--- a/tools/proxify/Dockerfile.template
+++ b/tools/proxify/Dockerfile.template
@@ -12,7 +12,7 @@ check-github-release-asset "projectdiscovery/proxify" "v${version}" "proxify_${v
 url="https://github.com/projectdiscovery/proxify/releases/download/v${version}/proxify_${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}" \
     proxify \
     replay \
     mitmrelay
diff --git a/tools/pv/Dockerfile.template b/tools/pv/Dockerfile.template
index 08457e64d..2154abe67 100644
--- a/tools/pv/Dockerfile.template
+++ b/tools/pv/Dockerfile.template
@@ -20,7 +20,7 @@ WORKDIR /tmp/pv
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/a-j-wood/pv .
 ./generate.sh
-./configure --prefix="${prefix}${target}"
+./configure --prefix="${prefix}"
 make
 make install
 EOF
\ No newline at end of file
diff --git a/tools/pwru/Dockerfile.template b/tools/pwru/Dockerfile.template
index e967bbf4d..5ef1d9567 100644
--- a/tools/pwru/Dockerfile.template
+++ b/tools/pwru/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cilium/pwru" "v${version}" "pwru-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cilium/pwru/releases/download/v${version}/pwru-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/python-build-standalone/Dockerfile.template b/tools/python-build-standalone/Dockerfile.template
index e5b3fae99..912131ba6 100644
--- a/tools/python-build-standalone/Dockerfile.template
+++ b/tools/python-build-standalone/Dockerfile.template
@@ -17,5 +17,5 @@ check-github-release-asset \
     "cpython-${PYTHON_VERSION}+${RELEASE_TAG}-${arch}-unknown-linux-musl-install_only.tar.gz"
 
 curl --silent --location --fail "https://github.com/indygreg/python-build-standalone/releases/download/${RELEASE_TAG}/cpython-${PYTHON_VERSION}+${RELEASE_TAG}-${arch}-unknown-linux-musl-install_only.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/" --strip-components=1 --no-same-owner
+| tar --extract --gzip --directory="${prefix}/" --strip-components=1 --no-same-owner
 EOF
\ No newline at end of file
diff --git a/tools/python/Dockerfile.template b/tools/python/Dockerfile.template
index e5b3fae99..912131ba6 100644
--- a/tools/python/Dockerfile.template
+++ b/tools/python/Dockerfile.template
@@ -17,5 +17,5 @@ check-github-release-asset \
     "cpython-${PYTHON_VERSION}+${RELEASE_TAG}-${arch}-unknown-linux-musl-install_only.tar.gz"
 
 curl --silent --location --fail "https://github.com/indygreg/python-build-standalone/releases/download/${RELEASE_TAG}/cpython-${PYTHON_VERSION}+${RELEASE_TAG}-${arch}-unknown-linux-musl-install_only.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/" --strip-components=1 --no-same-owner
+| tar --extract --gzip --directory="${prefix}/" --strip-components=1 --no-same-owner
 EOF
\ No newline at end of file

From 5a39635f8660053958b790742030a3259ae9970e Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sat, 30 Dec 2023 22:57:03 +0100
Subject: [PATCH 03/10] Fixed builds #2213

---
 tools/pass-audit/Dockerfile.template      |  6 +++---
 tools/pass-git-helper/Dockerfile.template |  7 ++++---
 tools/pass-import/Dockerfile.template     |  6 +++---
 tools/pigz/Dockerfile.template            | 24 ++++++++---------------
 tools/pipx/Dockerfile.template            |  2 +-
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/tools/pass-audit/Dockerfile.template b/tools/pass-audit/Dockerfile.template
index 5d1d34ef7..0e5bd7ecd 100644
--- a/tools/pass-audit/Dockerfile.template
+++ b/tools/pass-audit/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
-COPY --link --from=pipx / /
+COPY --link --from=pipx / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -17,8 +17,6 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-ENV PIPX_HOME=${prefix}/libexec/pipx \
-    PIPX_BIN_DIR=${prefix}/bin
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -34,6 +32,8 @@ check-github-release-asset "roddhjav/pass-audit" "v${version}" "pass-audit-${ver
 curl --silent --location --fail "https://github.com/roddhjav/pass-audit/releases/download/v${version}/pass-audit-${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1 --no-same-owner
 patch </tmp/setup.cfg.patch
+export PIPX_HOME="${prefix}/libexec/pipx"
+export PIPX_BIN_DIR="${prefix}/bin"
 pipx install .
 ln --symbolic --relative --force "${prefix}/libexec/pipx/venvs/pass-audit/bin/paudit" "${prefix}/bin/paudit"
 sed -i "s|#\!${prefix}/|#\!/|" "${prefix}/libexec/pipx/venvs/pass-audit/bin/paudit"
diff --git a/tools/pass-git-helper/Dockerfile.template b/tools/pass-git-helper/Dockerfile.template
index 05459c51c..85b164835 100644
--- a/tools/pass-git-helper/Dockerfile.template
+++ b/tools/pass-git-helper/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
-COPY --link --from=pipx / /
+COPY --link --from=pipx / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -17,14 +17,15 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-ENV PIPX_HOME=${prefix}/libexec/pipx \
-    PIPX_BIN_DIR=${prefix}/bin
 WORKDIR /tmp/pass-git-helper
 ARG name
 ARG version
 RUN <<EOF
 curl --silent --location --fail "https://github.com/languitar/pass-git-helper/archive/refs/tags/v${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1 --no-same-owner
+printenv | sort
+export PIPX_HOME="${prefix}/libexec/pipx"
+export PIPX_BIN_DIR="${prefix}/bin"
 pipx install .
 ln --symbolic --relative --force "${prefix}/libexec/pipx/venvs/pass-git-helper/bin/pass-git-helper" "${prefix}/bin/pass-git-helper"
 sed -i "s|#\!${prefix}/|#\!/|" "${prefix}/libexec/pipx/venvs/pass-git-helper/bin/pass-git-helper"
diff --git a/tools/pass-import/Dockerfile.template b/tools/pass-import/Dockerfile.template
index df171d335..7619f8bc0 100644
--- a/tools/pass-import/Dockerfile.template
+++ b/tools/pass-import/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
-COPY --link --from=pipx / /
+COPY --link --from=pipx / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -17,11 +17,11 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-ENV PIPX_HOME=${prefix}/libexec/pipx \
-    PIPX_BIN_DIR=${prefix}/bin
 ARG name
 ARG version
 RUN <<EOF
+export PIPX_HOME="${prefix}/libexec/pipx"
+export PIPX_BIN_DIR="${prefix}/bin"
 pipx install pass-import
 ln --symbolic --relative --force "${prefix}/libexec/pipx/venvs/pass-import/bin/pimport" "${prefix}/bin/pimport"
 sed -i "s|#\!${prefix}/|#\!/|" "${prefix}/libexec/pipx/venvs/pass-import/bin/pimport"
diff --git a/tools/pigz/Dockerfile.template b/tools/pigz/Dockerfile.template
index dc02db180..9441ecfcc 100644
--- a/tools/pigz/Dockerfile.template
+++ b/tools/pigz/Dockerfile.template
@@ -1,6 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM ubuntu:22.04 AS build
+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 \
@@ -17,18 +21,6 @@ RUN <<EOF
 check-clone https://github.com/madler/pigz "v${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/madler/pigz .
 make pigz LDFLAGS=-static
-mkdir -p \
-    /opt/pigz/bin \
-    /opt/pigz/share/man/man1
-cp pigz /opt/pigz/bin/
-cp pigz.1 /opt/pigz/share/man/man1/
-EOF
-
-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 /opt/pigz/ ${prefix}/
\ No newline at end of file
+cp pigz "${prefix}/bin/"
+cp pigz.1 "${prefix}/share/man/man1/"
+EOF
\ No newline at end of file
diff --git a/tools/pipx/Dockerfile.template b/tools/pipx/Dockerfile.template
index 1955fcefe..21a96f789 100644
--- a/tools/pipx/Dockerfile.template
+++ b/tools/pipx/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \

From c325b34069ee91d2559513e6fd0c5b45b4e1a506 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sat, 30 Dec 2023 23:10:22 +0100
Subject: [PATCH 04/10] Attempt to fix 403

---
 .github/workflows/check.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 3b4dc378a..4de554051 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -17,6 +17,8 @@ jobs:
 
   collect:
     name: Collect tools
+    permissions:
+      pull-requests: read
     runs-on: ubuntu-22.04
     outputs:
       tools: ${{ steps.collect.outputs.tools }}

From d057f1b9fe610bdfc72836f48eb86c3efd4e0d3b Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sun, 31 Dec 2023 01:37:30 +0000
Subject: [PATCH 05/10] chore(deps): update dependency uniget-org/cli to
 v0.11.2

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

diff --git a/tools/uniget/manifest.yaml b/tools/uniget/manifest.yaml
index 33a28e5eb..82c33c306 100644
--- a/tools/uniget/manifest.yaml
+++ b/tools/uniget/manifest.yaml
@@ -1,5 +1,5 @@
 name: uniget
-version: "0.11.1"
+version: "0.11.2"
 check: ${binary} --version | cut -d' ' -f3
 platforms:
 - linux/amd64

From 4418f5ece35f1c248d6ef0f088df91014cd671ef Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 21 Dec 2023 11:54:59 +0100
Subject: [PATCH 06/10] Remove target for f* #2213

---
 tools/faas-cli/Dockerfile.template                   | 7 +++++--
 tools/faasd/Dockerfile.template                      | 7 +++++--
 tools/falco/Dockerfile.template                      | 8 +++++---
 tools/falcosidekick/Dockerfile.template              | 8 +++++---
 tools/fd/Dockerfile.template                         | 8 +++++---
 tools/figlet/Dockerfile.template                     | 8 +++++---
 tools/firecracker/Dockerfile.template                | 7 +++++--
 tools/firectl/Dockerfile.template                    | 7 +++++--
 tools/firejail/Dockerfile.template                   | 8 +++++---
 tools/flarectl/Dockerfile.template                   | 8 +++++---
 tools/fleet/Dockerfile.template                      | 8 +++++---
 tools/flux/Dockerfile.template                       | 8 +++++---
 tools/flux2/Dockerfile.template                      | 8 +++++---
 tools/flyctl/Dockerfile.template                     | 4 +---
 tools/fontawesome-free/Dockerfile.template           | 8 +++++---
 tools/footloose/Dockerfile.template                  | 8 +++++---
 tools/forgejo/Dockerfile.template                    | 8 +++++---
 tools/forgit/Dockerfile.template                     | 8 +++++---
 tools/fq/Dockerfile.template                         | 8 +++++---
 tools/fregot/Dockerfile.template                     | 8 +++++---
 tools/furyctl/Dockerfile.template                    | 8 +++++---
 tools/fuse-overlayfs-snapshotter/Dockerfile.template | 8 +++++---
 tools/fuse-overlayfs/Dockerfile.template             | 8 +++++---
 tools/fx/Dockerfile.template                         | 8 +++++---
 tools/fzf/Dockerfile.template                        | 8 +++++---
 25 files changed, 121 insertions(+), 71 deletions(-)

diff --git a/tools/faas-cli/Dockerfile.template b/tools/faas-cli/Dockerfile.template
index a1af089f3..a0f38547c 100644
--- a/tools/faas-cli/Dockerfile.template
+++ b/tools/faas-cli/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
diff --git a/tools/faasd/Dockerfile.template b/tools/faasd/Dockerfile.template
index 342343b91..e1413a047 100644
--- a/tools/faasd/Dockerfile.template
+++ b/tools/faasd/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
diff --git a/tools/falco/Dockerfile.template b/tools/falco/Dockerfile.template
index ddf6e3653..a29918e41 100644
--- a/tools/falco/Dockerfile.template
+++ b/tools/falco/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/falcosidekick/Dockerfile.template b/tools/falcosidekick/Dockerfile.template
index 51a8ce3c9..40f61836b 100644
--- a/tools/falcosidekick/Dockerfile.template
+++ b/tools/falcosidekick/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/fd/Dockerfile.template b/tools/fd/Dockerfile.template
index ebf6fdde0..33d0149f9 100644
--- a/tools/fd/Dockerfile.template
+++ b/tools/fd/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/figlet/Dockerfile.template b/tools/figlet/Dockerfile.template
index 0570e0fc3..53c918171 100644
--- a/tools/figlet/Dockerfile.template
+++ b/tools/figlet/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM ubuntu:22.04 AS build
 RUN <<EOF
 apt-get update
@@ -23,7 +21,11 @@ make figlet LDFLAGS=-static DEFAULTFONTDIR=${target}/share/figlet
 make install prefix=/opt/figlet
 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 /opt/figlet/ ${prefix}${target}/
\ No newline at end of file
diff --git a/tools/firecracker/Dockerfile.template b/tools/firecracker/Dockerfile.template
index 949844583..0f37654fe 100644
--- a/tools/firecracker/Dockerfile.template
+++ b/tools/firecracker/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
diff --git a/tools/firectl/Dockerfile.template b/tools/firectl/Dockerfile.template
index e1088f61c..10fb58f60 100644
--- a/tools/firectl/Dockerfile.template
+++ b/tools/firectl/Dockerfile.template
@@ -1,7 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
diff --git a/tools/firejail/Dockerfile.template b/tools/firejail/Dockerfile.template
index a6cb29566..ecf4dd7e0 100644
--- a/tools/firejail/Dockerfile.template
+++ b/tools/firejail/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b AS build
 RUN <<EOF
 apt-get update
@@ -24,7 +22,11 @@ rm -f /usr/local/man
 rm -f /usr/local/sbin/unminimize
 EOF
 
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 COPY --from=build /usr/local/ ${prefix}${target}/
\ No newline at end of file
diff --git a/tools/flarectl/Dockerfile.template b/tools/flarectl/Dockerfile.template
index 318c36b92..81e83262b 100644
--- a/tools/flarectl/Dockerfile.template
+++ b/tools/flarectl/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/fleet/Dockerfile.template b/tools/fleet/Dockerfile.template
index de85b3614..2fe5035ae 100644
--- a/tools/fleet/Dockerfile.template
+++ b/tools/fleet/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/flux/Dockerfile.template b/tools/flux/Dockerfile.template
index 41f100c4d..af0363644 100644
--- a/tools/flux/Dockerfile.template
+++ b/tools/flux/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/flux2/Dockerfile.template b/tools/flux2/Dockerfile.template
index 1fe67327e..65f653a29 100644
--- a/tools/flux2/Dockerfile.template
+++ b/tools/flux2/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/flyctl/Dockerfile.template b/tools/flyctl/Dockerfile.template
index df8c682b4..6e27120c2 100644
--- a/tools/flyctl/Dockerfile.template
+++ b/tools/flyctl/Dockerfile.template
@@ -1,8 +1,6 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS download
+FROM ghcr.io/uniget-org/tools/base:latest AS download
 ARG name
 ARG version
 RUN <<EOF
diff --git a/tools/fontawesome-free/Dockerfile.template b/tools/fontawesome-free/Dockerfile.template
index 245ae2f5c..74a0a6ad1 100644
--- a/tools/fontawesome-free/Dockerfile.template
+++ b/tools/fontawesome-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/footloose/Dockerfile.template b/tools/footloose/Dockerfile.template
index da14c54f8..4e263b5de 100644
--- a/tools/footloose/Dockerfile.template
+++ b/tools/footloose/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/forgejo/Dockerfile.template b/tools/forgejo/Dockerfile.template
index 95b8ff28b..b645187d7 100644
--- a/tools/forgejo/Dockerfile.template
+++ b/tools/forgejo/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/forgit/Dockerfile.template b/tools/forgit/Dockerfile.template
index 0a4574f17..88dd905a7 100644
--- a/tools/forgit/Dockerfile.template
+++ b/tools/forgit/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/fq/Dockerfile.template b/tools/fq/Dockerfile.template
index 3800662dd..95f7a00c0 100644
--- a/tools/fq/Dockerfile.template
+++ b/tools/fq/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/fregot/Dockerfile.template b/tools/fregot/Dockerfile.template
index a5acf64a9..a40b20612 100644
--- a/tools/fregot/Dockerfile.template
+++ b/tools/fregot/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/furyctl/Dockerfile.template b/tools/furyctl/Dockerfile.template
index 87d82f12f..be6f5b02c 100644
--- a/tools/furyctl/Dockerfile.template
+++ b/tools/furyctl/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/fuse-overlayfs-snapshotter/Dockerfile.template b/tools/fuse-overlayfs-snapshotter/Dockerfile.template
index 42ab43ae1..8757414b3 100644
--- a/tools/fuse-overlayfs-snapshotter/Dockerfile.template
+++ b/tools/fuse-overlayfs-snapshotter/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 fuse-overlayfs-snapshotter.service ${prefix}${target}/etc/systemd/system/
diff --git a/tools/fuse-overlayfs/Dockerfile.template b/tools/fuse-overlayfs/Dockerfile.template
index 34f0ef807..7e7418e3b 100644
--- a/tools/fuse-overlayfs/Dockerfile.template
+++ b/tools/fuse-overlayfs/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/fx/Dockerfile.template b/tools/fx/Dockerfile.template
index e5d6d1ad1..538c93dff 100644
--- a/tools/fx/Dockerfile.template
+++ b/tools/fx/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/fzf/Dockerfile.template b/tools/fzf/Dockerfile.template
index cb09088cb..96e50646d 100644
--- a/tools/fzf/Dockerfile.template
+++ b/tools/fzf/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 ffdd6c555d99798ceb0d7e34425e5e13c2d7289a Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 15:41:56 +0100
Subject: [PATCH 07/10] Removed target var #2213

---
 tools/faas-cli/Dockerfile.template            |  4 ++--
 tools/faasd/Dockerfile.template               |  8 +++----
 tools/falco/Dockerfile.template               | 12 +++++-----
 tools/falcosidekick/Dockerfile.template       |  2 +-
 tools/fd/Dockerfile.template                  | 12 +++++-----
 tools/figlet/Dockerfile.template              |  4 ++--
 tools/firecracker/Dockerfile.template         |  8 +++----
 tools/firectl/Dockerfile.template             |  4 ++--
 tools/firejail/Dockerfile.template            |  2 +-
 tools/flarectl/Dockerfile.template            |  2 +-
 tools/fleet/Dockerfile.template               | 24 +++++++++----------
 tools/flux/Dockerfile.template                |  2 +-
 tools/flux2/Dockerfile.template               |  8 +++----
 tools/flyctl/Dockerfile.template              |  8 +++----
 tools/fontawesome-free/Dockerfile.template    |  4 ++--
 tools/footloose/Dockerfile.template           |  4 ++--
 tools/forgejo/Dockerfile.template             |  4 ++--
 tools/forgit/Dockerfile.template              |  2 +-
 tools/fq/Dockerfile.template                  |  2 +-
 tools/fregot/Dockerfile.template              |  2 +-
 tools/furyctl/Dockerfile.template             |  8 +++----
 .../Dockerfile.template                       |  4 ++--
 tools/fuse-overlayfs/Dockerfile.template      |  4 ++--
 tools/fx/Dockerfile.template                  |  4 ++--
 tools/fzf/Dockerfile.template                 |  2 +-
 25 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/tools/faas-cli/Dockerfile.template b/tools/faas-cli/Dockerfile.template
index a0f38547c..6c4f9422b 100644
--- a/tools/faas-cli/Dockerfile.template
+++ b/tools/faas-cli/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "openfaas/faas-cli" "${version}" "faas-cli"
-curl --silent --location --fail --output "${prefix}${target}/bin/faas-cli" \
+curl --silent --location --fail --output "${prefix}/bin/faas-cli" \
     "https://github.com/openfaas/faas-cli/releases/download/${version}/faas-cli"
-chmod +x "${prefix}${target}/bin/faas-cli"
+chmod +x "${prefix}/bin/faas-cli"
 EOF
\ No newline at end of file
diff --git a/tools/faasd/Dockerfile.template b/tools/faasd/Dockerfile.template
index e1413a047..200608697 100644
--- a/tools/faasd/Dockerfile.template
+++ b/tools/faasd/Dockerfile.template
@@ -11,12 +11,12 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "openfaas/faasd" "${version}" "faasd"
-curl --silent --location --fail --output "${prefix}${target}/bin/faasd" \
+curl --silent --location --fail --output "${prefix}/bin/faasd" \
     "https://github.com/openfaas/faasd/releases/download/${version}/faasd"
-chmod +x "${prefix}${target}/bin/faasd"
+chmod +x "${prefix}/bin/faasd"
 
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/faasd.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/faasd.service" \
     "https://github.com/openfaas/faasd/raw/${version}/hack/faasd.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/faasd-provider.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/faasd-provider.service" \
     "https://github.com/openfaas/faasd/raw/${version}/hack/faasd-provider.service"
 EOF
\ No newline at end of file
diff --git a/tools/falco/Dockerfile.template b/tools/falco/Dockerfile.template
index a29918e41..e5d9df697 100644
--- a/tools/falco/Dockerfile.template
+++ b/tools/falco/Dockerfile.template
@@ -11,11 +11,11 @@ RUN <<EOF
 curl --silent --location --fail "https://download.falco.org/packages/bin/${arch}/falco-${version}-${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}" --strip-components=1 --no-same-owner
 
-mv "${prefix}/usr/bin/" "${prefix}${target}/"
-mv "${prefix}/usr/src/" "${prefix}${target}/"
-mv "${prefix}/usr/share/falco/" "${prefix}${target}/share/"
+mv "${prefix}/usr/bin/" "${prefix}/"
+mv "${prefix}/usr/src/" "${prefix}/"
+mv "${prefix}/usr/share/falco/" "${prefix}/share/"
 
-"${prefix}${target}/bin/falcoctl" completion bash >"${prefix}${target}/share/bash-completion/completions/falcoctl"
-"${prefix}${target}/bin/falcoctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/falcoctl.fish"
-"${prefix}${target}/bin/falcoctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_falcoctl"
+"${prefix}/bin/falcoctl" completion bash >"${prefix}/share/bash-completion/completions/falcoctl"
+"${prefix}/bin/falcoctl" completion fish >"${prefix}/share/fish/vendor_completions.d/falcoctl.fish"
+"${prefix}/bin/falcoctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_falcoctl"
 EOF
\ No newline at end of file
diff --git a/tools/falcosidekick/Dockerfile.template b/tools/falcosidekick/Dockerfile.template
index 40f61836b..f8f9db6af 100644
--- a/tools/falcosidekick/Dockerfile.template
+++ b/tools/falcosidekick/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "falcosecurity/falcosidekick" "${version}" "falcosidekick_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/falcosecurity/falcosidekick/releases/download/${version}/falcosidekick_${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 \
     falcosidekick
 EOF
diff --git a/tools/fd/Dockerfile.template b/tools/fd/Dockerfile.template
index 33d0149f9..a3e605448 100644
--- a/tools/fd/Dockerfile.template
+++ b/tools/fd/Dockerfile.template
@@ -26,15 +26,15 @@ check-github-release-asset "sharkdp/fd" "v${version}" "fd-v${version}-${arch}-un
 
 echo "### Downloading fd ${version}"
 curl --silent --location --fail "https://github.com/sharkdp/fd/releases/download/v${version}/fd-v${version}-${arch}-unknown-linux-${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     "fd-v${version}-${arch}-unknown-linux-${arch_suffix}/fd" \
     "fd-v${version}-${arch}-unknown-linux-${arch_suffix}/fd.1" \
     "fd-v${version}-${arch}-unknown-linux-${arch_suffix}/autocomplete"
 
-mv "${prefix}${target}/bin/fd.1" "${prefix}${target}/share/man/man1/"
+mv "${prefix}/bin/fd.1" "${prefix}/share/man/man1/"
 
-mv "${prefix}${target}/bin/autocomplete/fd.bash" "${prefix}${target}/share/bash-completion/completions/fd"
-mv "${prefix}${target}/bin/autocomplete/fd.fish" "${prefix}${target}/share/fish/vendor_completions.d/fd.fish"
-mv "${prefix}${target}/bin/autocomplete/_fd"     "${prefix}${target}/share/zsh/vendor-completions/_fd"
-rm -rf "${prefix}${target}/bin/autocomplete"
+mv "${prefix}/bin/autocomplete/fd.bash" "${prefix}/share/bash-completion/completions/fd"
+mv "${prefix}/bin/autocomplete/fd.fish" "${prefix}/share/fish/vendor_completions.d/fd.fish"
+mv "${prefix}/bin/autocomplete/_fd"     "${prefix}/share/zsh/vendor-completions/_fd"
+rm -rf "${prefix}/bin/autocomplete"
 EOF
\ No newline at end of file
diff --git a/tools/figlet/Dockerfile.template b/tools/figlet/Dockerfile.template
index 53c918171..dac824d45 100644
--- a/tools/figlet/Dockerfile.template
+++ b/tools/figlet/Dockerfile.template
@@ -17,7 +17,7 @@ RUN <<EOF
 check-download "http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz"
 curl --silent --location --fail "http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1
-make figlet LDFLAGS=-static DEFAULTFONTDIR=${target}/share/figlet
+make figlet LDFLAGS=-static DEFAULTFONTDIR=/share/figlet
 make install prefix=/opt/figlet
 EOF
 
@@ -28,4 +28,4 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=build /opt/figlet/ ${prefix}${target}/
\ No newline at end of file
+COPY --from=build /opt/figlet/ ${prefix}/
\ No newline at end of file
diff --git a/tools/firecracker/Dockerfile.template b/tools/firecracker/Dockerfile.template
index 0f37654fe..42b0572ec 100644
--- a/tools/firecracker/Dockerfile.template
+++ b/tools/firecracker/Dockerfile.template
@@ -12,11 +12,11 @@ ARG version
 RUN <<EOF
 check-github-release-asset "firecracker-microvm/firecracker" "v${version}" "firecracker-v${version}-${arch}.tgz"
 curl --silent --location --fail "https://github.com/firecracker-microvm/firecracker/releases/download/v${version}/firecracker-v${version}-${arch}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     release-v${version}-${arch}/firecracker-v${version}-${arch} \
     release-v${version}-${arch}/jailer-v${version}-${arch} \
     release-v${version}-${arch}/seccompiler-bin-v${version}-${arch}
-mv "${prefix}${target}/bin/firecracker-v${version}-${arch}"     "${prefix}${target}/bin/firecracker"
-mv "${prefix}${target}/bin/jailer-v${version}-${arch}"          "${prefix}${target}/bin/jailer"
-mv "${prefix}${target}/bin/seccompiler-bin-v${version}-${arch}" "${prefix}${target}/bin/seccompiler-bin"
+mv "${prefix}/bin/firecracker-v${version}-${arch}"     "${prefix}/bin/firecracker"
+mv "${prefix}/bin/jailer-v${version}-${arch}"          "${prefix}/bin/jailer"
+mv "${prefix}/bin/seccompiler-bin-v${version}-${arch}" "${prefix}/bin/seccompiler-bin"
 EOF
\ No newline at end of file
diff --git a/tools/firectl/Dockerfile.template b/tools/firectl/Dockerfile.template
index 10fb58f60..669a38d49 100644
--- a/tools/firectl/Dockerfile.template
+++ b/tools/firectl/Dockerfile.template
@@ -11,7 +11,7 @@ ARG version
 
 RUN <<EOF
 check-github-release-asset "firecracker-microvm/firectl" "v${version}" "firectl-v${version}"
-curl --silent --location --fail --output "${prefix}${target}/bin/firectl" \
+curl --silent --location --fail --output "${prefix}/bin/firectl" \
     "https://github.com/firecracker-microvm/firectl/releases/download/v${version}/firectl-v${version}"
-chmod +x "${prefix}${target}/bin/firectl"
+chmod +x "${prefix}/bin/firectl"
 EOF
\ No newline at end of file
diff --git a/tools/firejail/Dockerfile.template b/tools/firejail/Dockerfile.template
index ecf4dd7e0..8349e9096 100644
--- a/tools/firejail/Dockerfile.template
+++ b/tools/firejail/Dockerfile.template
@@ -29,4 +29,4 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --from=build /usr/local/ ${prefix}${target}/
\ No newline at end of file
+COPY --from=build /usr/local/ ${prefix}/
\ No newline at end of file
diff --git a/tools/flarectl/Dockerfile.template b/tools/flarectl/Dockerfile.template
index 81e83262b..e0d5a7180 100644
--- a/tools/flarectl/Dockerfile.template
+++ b/tools/flarectl/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "cloudflare/cloudflare-go" "v${version}" "flarectl_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cloudflare/cloudflare-go/releases/download/v${version}/flarectl_${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 \
     flarectl
 EOF
\ No newline at end of file
diff --git a/tools/fleet/Dockerfile.template b/tools/fleet/Dockerfile.template
index 2fe5035ae..9fe77a085 100644
--- a/tools/fleet/Dockerfile.template
+++ b/tools/fleet/Dockerfile.template
@@ -9,30 +9,30 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "rancher/fleet" "v${version}" "fleet-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/fleet" \
+curl --silent --location --fail --output "${prefix}/bin/fleet" \
     "https://github.com/rancher/fleet/releases/download/v${version}/fleet-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/fleet"
+chmod +x "${prefix}/bin/fleet"
 
 check-github-release-asset "rancher/fleet" "v${version}" "fleetagent-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/fleetagent" \
+curl --silent --location --fail --output "${prefix}/bin/fleetagent" \
     "https://github.com/rancher/fleet/releases/download/v${version}/fleetagent-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/fleetagent"
+chmod +x "${prefix}/bin/fleetagent"
 
 check-github-release-asset "rancher/fleet" "v${version}" "fleetcontroller-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/fleetcontroller" \
+curl --silent --location --fail --output "${prefix}/bin/fleetcontroller" \
     "https://github.com/rancher/fleet/releases/download/v${version}/fleetcontroller-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/fleetcontroller"
+chmod +x "${prefix}/bin/fleetcontroller"
 
 curl --silent --location --fail "https://github.com/rancher/fleet/releases/download/v${version}/fleet-crd-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/share/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/share/" --no-same-owner
 
 curl --silent --location --fail "https://github.com/rancher/fleet/releases/download/v${version}/fleet-agent-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/share/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/share/" --no-same-owner
 
 curl --silent --location --fail "https://github.com/rancher/fleet/releases/download/v${version}/fleet-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/share/" --no-same-owner
+| tar --extract --gzip --directory="${prefix}/share/" --no-same-owner
 
-"${prefix}${target}/bin/fleet" completion bash >"${prefix}${target}/share/bash-completion/completions/fleet"
-"${prefix}${target}/bin/fleet" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/fleet.fish"
-"${prefix}${target}/bin/fleet" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_fleet"
+"${prefix}/bin/fleet" completion bash >"${prefix}/share/bash-completion/completions/fleet"
+"${prefix}/bin/fleet" completion fish >"${prefix}/share/fish/vendor_completions.d/fleet.fish"
+"${prefix}/bin/fleet" completion zsh >"${prefix}/share/zsh/vendor-completions/_fleet"
 EOF
\ No newline at end of file
diff --git a/tools/flux/Dockerfile.template b/tools/flux/Dockerfile.template
index af0363644..2e6c0ebbb 100644
--- a/tools/flux/Dockerfile.template
+++ b/tools/flux/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "influxdata/flux" "v${version}" "flux_${version}_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/influxdata/flux/releases/download/v${version}/flux_${version}_linux_amd64.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-component=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-component=1 --no-same-owner \
     "flux_${version}_linux_amd64/flux"
 EOF
\ No newline at end of file
diff --git a/tools/flux2/Dockerfile.template b/tools/flux2/Dockerfile.template
index 65f653a29..f9fb49a65 100644
--- a/tools/flux2/Dockerfile.template
+++ b/tools/flux2/Dockerfile.template
@@ -10,8 +10,8 @@ ARG version
 RUN <<EOF
 check-github-release-asset "fluxcd/flux2" "v${version}" "flux_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/fluxcd/flux2/releases/download/v${version}/flux_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
-"${prefix}${target}/bin/flux" completion bash >"${prefix}${target}/share/bash-completion/completions/flux"
-"${prefix}${target}/bin/flux" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/flux.fish"
-"${prefix}${target}/bin/flux" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_flux"
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
+"${prefix}/bin/flux" completion bash >"${prefix}/share/bash-completion/completions/flux"
+"${prefix}/bin/flux" completion fish >"${prefix}/share/fish/vendor_completions.d/flux.fish"
+"${prefix}/bin/flux" completion zsh >"${prefix}/share/zsh/vendor-completions/_flux"
 EOF
\ No newline at end of file
diff --git a/tools/flyctl/Dockerfile.template b/tools/flyctl/Dockerfile.template
index 6e27120c2..750f7ce7a 100644
--- a/tools/flyctl/Dockerfile.template
+++ b/tools/flyctl/Dockerfile.template
@@ -23,12 +23,12 @@ check-github-release-asset "superfly/flyctl" "v${version}" "flyctl_${version}_Li
 
 echo "### Downloading flyctl ${version}"
 curl --silent --location --fail "https://github.com/superfly/flyctl/releases/download/v${version}/flyctl_${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
 EOF
 
 FROM download AS prepare
 RUN <<EOF
-"${prefix}${target}/bin/flyctl" completion bash >"${prefix}${target}/share/bash-completion/completions/flyctl"
-"${prefix}${target}/bin/flyctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/flyctl.fish"
-"${prefix}${target}/bin/flyctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_flyctl"
+"${prefix}/bin/flyctl" completion bash >"${prefix}/share/bash-completion/completions/flyctl"
+"${prefix}/bin/flyctl" completion fish >"${prefix}/share/fish/vendor_completions.d/flyctl.fish"
+"${prefix}/bin/flyctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_flyctl"
 EOF
\ No newline at end of file
diff --git a/tools/fontawesome-free/Dockerfile.template b/tools/fontawesome-free/Dockerfile.template
index 74a0a6ad1..54923c324 100644
--- a/tools/fontawesome-free/Dockerfile.template
+++ b/tools/fontawesome-free/Dockerfile.template
@@ -12,6 +12,6 @@ check-github-release-asset "FortAwesome/Font-Awesome" "${version}" "fontawesome-
 url="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-web.zip"
 filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
-unzip -q -o -d "${prefix}${target}/share/" "${filename}"
-mv "${prefix}${target}/share/fontawesome-free-${version}-web" "${prefix}${target}/share/fontawesome-free"
+unzip -q -o -d "${prefix}/share/" "${filename}"
+mv "${prefix}/share/fontawesome-free-${version}-web" "${prefix}/share/fontawesome-free"
 EOF
\ No newline at end of file
diff --git a/tools/footloose/Dockerfile.template b/tools/footloose/Dockerfile.template
index 4e263b5de..04655824e 100644
--- a/tools/footloose/Dockerfile.template
+++ b/tools/footloose/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "weaveworks/footloose" "${version}" "footloose-${version}-linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/footloose" \
+curl --silent --location --fail --output "${prefix}/bin/footloose" \
     "https://github.com/weaveworks/footloose/releases/download/${version}/footloose-${version}-linux-${arch}"
-chmod +x "${prefix}${target}/bin/footloose"
+chmod +x "${prefix}/bin/footloose"
 EOF
\ No newline at end of file
diff --git a/tools/forgejo/Dockerfile.template b/tools/forgejo/Dockerfile.template
index b645187d7..a6861218c 100644
--- a/tools/forgejo/Dockerfile.template
+++ b/tools/forgejo/Dockerfile.template
@@ -21,6 +21,6 @@ url="$(
 test -n "${url}"
 check-download "${url}"
 curl --silent --location --fail "${url}" \
-| xz --decompress >"${prefix}${target}/bin/forgejo"
-chmod +x "${prefix}${target}/bin/forgejo"
+| xz --decompress >"${prefix}/bin/forgejo"
+chmod +x "${prefix}/bin/forgejo"
 EOF
\ No newline at end of file
diff --git a/tools/forgit/Dockerfile.template b/tools/forgit/Dockerfile.template
index 88dd905a7..8b4844522 100644
--- a/tools/forgit/Dockerfile.template
+++ b/tools/forgit/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/forgit.sh" \
+curl --silent --location --fail --output "${prefix}/etc/profile.d/forgit.sh" \
     "https://github.com/wfxr/forgit/raw/${version}/forgit.plugin.zsh"
 EOF
\ No newline at end of file
diff --git a/tools/fq/Dockerfile.template b/tools/fq/Dockerfile.template
index 95f7a00c0..546e8337a 100644
--- a/tools/fq/Dockerfile.template
+++ b/tools/fq/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "wader/fq" "v${version}" "fq_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/wader/fq/releases/download/v${version}/fq_${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/fregot/Dockerfile.template b/tools/fregot/Dockerfile.template
index a40b20612..225e0c323 100644
--- a/tools/fregot/Dockerfile.template
+++ b/tools/fregot/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "fugue/fregot" "v${version}" "fregot-v${version}-linux.tar.gz"
 curl --silent --location --fail "https://github.com/fugue/fregot/releases/download/v${version}/fregot-v${version}-linux.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/furyctl/Dockerfile.template b/tools/furyctl/Dockerfile.template
index be6f5b02c..dbbb4e390 100644
--- a/tools/furyctl/Dockerfile.template
+++ b/tools/furyctl/Dockerfile.template
@@ -10,9 +10,9 @@ ARG version
 RUN <<EOF
 check-github-release-asset "sighupio/furyctl" "v${version}" "furyctl-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/sighupio/furyctl/releases/download/v${version}/furyctl-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     furyctl
-"${prefix}${target}/bin/furyctl" completion bash >"${prefix}${target}/share/bash-completion/completions/furyctl"
-"${prefix}${target}/bin/furyctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/furyctl.fish"
-"${prefix}${target}/bin/furyctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_furyctl"
+"${prefix}/bin/furyctl" completion bash >"${prefix}/share/bash-completion/completions/furyctl"
+"${prefix}/bin/furyctl" completion fish >"${prefix}/share/fish/vendor_completions.d/furyctl.fish"
+"${prefix}/bin/furyctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_furyctl"
 EOF
\ No newline at end of file
diff --git a/tools/fuse-overlayfs-snapshotter/Dockerfile.template b/tools/fuse-overlayfs-snapshotter/Dockerfile.template
index 8757414b3..52354bf28 100644
--- a/tools/fuse-overlayfs-snapshotter/Dockerfile.template
+++ b/tools/fuse-overlayfs-snapshotter/Dockerfile.template
@@ -7,9 +7,9 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY fuse-overlayfs-snapshotter.service ${prefix}${target}/etc/systemd/system/
+COPY fuse-overlayfs-snapshotter.service ${prefix}/etc/systemd/system/
 RUN <<EOF
 check-github-release-asset "containerd/fuse-overlayfs-snapshotter" "v${version}" "containerd-fuse-overlayfs-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/containerd/fuse-overlayfs-snapshotter/releases/download/v${version}/containerd-fuse-overlayfs-${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/fuse-overlayfs/Dockerfile.template b/tools/fuse-overlayfs/Dockerfile.template
index 7e7418e3b..eb90df2ed 100644
--- a/tools/fuse-overlayfs/Dockerfile.template
+++ b/tools/fuse-overlayfs/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "containers/fuse-overlayfs" "v${version}" "fuse-overlayfs-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/${name}" \
+curl --silent --location --fail --output "${prefix}/bin/${name}" \
     "https://github.com/containers/fuse-overlayfs/releases/download/v${version}/fuse-overlayfs-${arch}"
-chmod +x "${prefix}${target}/bin/${name}"
+chmod +x "${prefix}/bin/${name}"
 EOF
\ No newline at end of file
diff --git a/tools/fx/Dockerfile.template b/tools/fx/Dockerfile.template
index 538c93dff..c20e1e316 100644
--- a/tools/fx/Dockerfile.template
+++ b/tools/fx/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "antonmedv/fx" "${version}" "fx_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/fx" \
+curl --silent --location --fail --output "${prefix}/bin/fx" \
     "https://github.com/antonmedv/fx/releases/download/${version}/fx_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/fx"
+chmod +x "${prefix}/bin/fx"
 EOF
\ No newline at end of file
diff --git a/tools/fzf/Dockerfile.template b/tools/fzf/Dockerfile.template
index 96e50646d..9ebf3f99b 100644
--- a/tools/fzf/Dockerfile.template
+++ b/tools/fzf/Dockerfile.template
@@ -10,5 +10,5 @@ ARG version
 RUN <<EOF
 check-github-release-asset "junegunn/fzf" "${version}" "fzf-${version}-linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/junegunn/fzf/releases/download/${version}/fzf-${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

From 95f56a1b8b5342d8fb4b29fc21bf87abdc4a894f Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sun, 31 Dec 2023 13:25:18 +0100
Subject: [PATCH 08/10] Fixed build #2213

---
 tools/figlet/Dockerfile.template   | 19 +++++++------------
 tools/firejail/Dockerfile.template | 23 ++++++++---------------
 tools/flyctl/Dockerfile.template   |  9 +++++----
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/tools/figlet/Dockerfile.template b/tools/figlet/Dockerfile.template
index dac824d45..a09b95d20 100644
--- a/tools/figlet/Dockerfile.template
+++ b/tools/figlet/Dockerfile.template
@@ -1,6 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM ubuntu:22.04 AS build
+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 \
@@ -18,14 +22,5 @@ check-download "http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.
 curl --silent --location --fail "http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1
 make figlet LDFLAGS=-static DEFAULTFONTDIR=/share/figlet
-make install prefix=/opt/figlet
-EOF
-
-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 /opt/figlet/ ${prefix}/
\ No newline at end of file
+make install prefix="${prefix}"
+EOF
\ No newline at end of file
diff --git a/tools/firejail/Dockerfile.template b/tools/firejail/Dockerfile.template
index 8349e9096..194ecfc96 100644
--- a/tools/firejail/Dockerfile.template
+++ b/tools/firejail/Dockerfile.template
@@ -1,6 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b AS build
+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 \
@@ -14,19 +18,8 @@ ARG name
 ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/netblue30/firejail .
-./configure --prefix=/usr/local
+./configure --prefix="${prefix}"
 make
 make install-strip
-mv /usr/local/share/zsh/site-functions /usr/local/share/zsh/vendor-completions
-rm -f /usr/local/man
-rm -f /usr/local/sbin/unminimize
-EOF
-
-FROM nicholasdille/ubuntu:22.04 AS prepare
-COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
-    /etc/profile.d/ \
-    /etc/profile.d/
-SHELL [ "bash", "-clo", "errexit" ]
-ARG name
-ARG version
-COPY --from=build /usr/local/ ${prefix}/
\ No newline at end of file
+mv "${prefix}/share/zsh/site-functions" "${prefix}/share/zsh/vendor-completions"
+EOF
\ No newline at end of file
diff --git a/tools/flyctl/Dockerfile.template b/tools/flyctl/Dockerfile.template
index 750f7ce7a..e7af97d07 100644
--- a/tools/flyctl/Dockerfile.template
+++ b/tools/flyctl/Dockerfile.template
@@ -1,6 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-FROM ghcr.io/uniget-org/tools/base:latest AS download
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
@@ -24,10 +28,7 @@ check-github-release-asset "superfly/flyctl" "v${version}" "flyctl_${version}_Li
 echo "### Downloading flyctl ${version}"
 curl --silent --location --fail "https://github.com/superfly/flyctl/releases/download/v${version}/flyctl_${version}_Linux_${arch_suffix}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
-EOF
 
-FROM download AS prepare
-RUN <<EOF
 "${prefix}/bin/flyctl" completion bash >"${prefix}/share/bash-completion/completions/flyctl"
 "${prefix}/bin/flyctl" completion fish >"${prefix}/share/fish/vendor_completions.d/flyctl.fish"
 "${prefix}/bin/flyctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_flyctl"

From 8186b7e7336abd66eedfebfe667833a824ac6f01 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sun, 31 Dec 2023 16:30:16 +0100
Subject: [PATCH 09/10] Fixed build #2213

---
 tools/pre-commit/Dockerfile.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/pre-commit/Dockerfile.template b/tools/pre-commit/Dockerfile.template
index 6908d4e98..09b0c6e0e 100644
--- a/tools/pre-commit/Dockerfile.template
+++ b/tools/pre-commit/Dockerfile.template
@@ -10,8 +10,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-#COPY --link --from=python / /
-COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \

From 8483e36bf427a44911797c22f7c504998ceeacc9 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Sun, 31 Dec 2023 16:31:12 +0100
Subject: [PATCH 10/10] Fixed commented copy commands #2213

---
 @template/Dockerfile.template             | 4 ++--
 tools/aws/Dockerfile.template             | 2 +-
 tools/az/Dockerfile.template              | 2 +-
 tools/bogrod/Dockerfile.template          | 2 +-
 tools/checkov/Dockerfile.template         | 2 +-
 tools/cve-bin-tool/Dockerfile.template    | 2 +-
 tools/devcontainer/Dockerfile.template    | 2 +-
 tools/gita/Dockerfile.template            | 2 +-
 tools/gitlab-release/Dockerfile.template  | 2 +-
 tools/gitlabci-local/Dockerfile.template  | 2 +-
 tools/gsutil/Dockerfile.template          | 2 +-
 tools/httpie/Dockerfile.template          | 2 +-
 tools/it-depends/Dockerfile.template      | 2 +-
 tools/kitt/Dockerfile.template            | 2 +-
 tools/mkdocs/Dockerfile.template          | 4 ++--
 tools/mu-repo/Dockerfile.template         | 2 +-
 tools/pass-audit/Dockerfile.template      | 2 +-
 tools/pass-git-helper/Dockerfile.template | 2 +-
 tools/pass-import/Dockerfile.template     | 2 +-
 tools/pipx/Dockerfile.template            | 2 +-
 tools/runlike/Dockerfile.template         | 2 +-
 tools/sbom2dot/Dockerfile.template        | 2 +-
 tools/sbomdiff/Dockerfile.template        | 2 +-
 tools/sbomtools/Dockerfile.template       | 2 +-
 tools/semgrep/Dockerfile.template         | 4 ++--
 tools/shell-gpt/Dockerfile.template       | 2 +-
 tools/termgraph/Dockerfile.template       | 2 +-
 tools/tern/Dockerfile.template            | 2 +-
 tools/vexy/Dockerfile.template            | 2 +-
 tools/wordcloud/Dockerfile.template       | 2 +-
 tools/yamale/Dockerfile.template          | 2 +-
 tools/yamllint/Dockerfile.template        | 2 +-
 32 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/@template/Dockerfile.template b/@template/Dockerfile.template
index 0f123b79f..790d62fcc 100644
--- a/@template/Dockerfile.template
+++ b/@template/Dockerfile.template
@@ -120,8 +120,8 @@ ARG version
 #EOF
 
 # python
-#COPY --link --from=python / /
-#COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+#COPY --link --from=shiv / /usr/local/
 #RUN <<EOF
 #apt-get update
 #apt-get -y install --no-install-recommends \
diff --git a/tools/aws/Dockerfile.template b/tools/aws/Dockerfile.template
index 8ffed9205..c8ac74204 100644
--- a/tools/aws/Dockerfile.template
+++ b/tools/aws/Dockerfile.template
@@ -15,7 +15,7 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 ARG name
 ARG version
diff --git a/tools/az/Dockerfile.template b/tools/az/Dockerfile.template
index 8d6a7cb5e..623f148aa 100644
--- a/tools/az/Dockerfile.template
+++ b/tools/az/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/bogrod/Dockerfile.template b/tools/bogrod/Dockerfile.template
index 2242d3d04..ba10eaef6 100644
--- a/tools/bogrod/Dockerfile.template
+++ b/tools/bogrod/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/checkov/Dockerfile.template b/tools/checkov/Dockerfile.template
index 6cf17c12b..dbbccf7b0 100644
--- a/tools/checkov/Dockerfile.template
+++ b/tools/checkov/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/cve-bin-tool/Dockerfile.template b/tools/cve-bin-tool/Dockerfile.template
index 0f90d02cf..3587f0083 100644
--- a/tools/cve-bin-tool/Dockerfile.template
+++ b/tools/cve-bin-tool/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/devcontainer/Dockerfile.template b/tools/devcontainer/Dockerfile.template
index db9950304..c5d813374 100644
--- a/tools/devcontainer/Dockerfile.template
+++ b/tools/devcontainer/Dockerfile.template
@@ -12,7 +12,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --link --from=python / /
+COPY --link --from=python / /usr/local/
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
 COPY --link --from=make / /
diff --git a/tools/gita/Dockerfile.template b/tools/gita/Dockerfile.template
index 40b57db4a..c23362b22 100644
--- a/tools/gita/Dockerfile.template
+++ b/tools/gita/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 ARG name
 ARG version
diff --git a/tools/gitlab-release/Dockerfile.template b/tools/gitlab-release/Dockerfile.template
index 3e3f1dfbb..4e6475cb3 100644
--- a/tools/gitlab-release/Dockerfile.template
+++ b/tools/gitlab-release/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/gitlabci-local/Dockerfile.template b/tools/gitlabci-local/Dockerfile.template
index 56ccf85f1..6f539cb3c 100644
--- a/tools/gitlabci-local/Dockerfile.template
+++ b/tools/gitlabci-local/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/gsutil/Dockerfile.template b/tools/gsutil/Dockerfile.template
index b4611e83f..5aa74be9a 100644
--- a/tools/gsutil/Dockerfile.template
+++ b/tools/gsutil/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/httpie/Dockerfile.template b/tools/httpie/Dockerfile.template
index 4054d09e3..a6bf81186 100644
--- a/tools/httpie/Dockerfile.template
+++ b/tools/httpie/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/it-depends/Dockerfile.template b/tools/it-depends/Dockerfile.template
index 047f99248..932d96aff 100644
--- a/tools/it-depends/Dockerfile.template
+++ b/tools/it-depends/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/kitt/Dockerfile.template b/tools/kitt/Dockerfile.template
index 549c16952..8367f4057 100644
--- a/tools/kitt/Dockerfile.template
+++ b/tools/kitt/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/mkdocs/Dockerfile.template b/tools/mkdocs/Dockerfile.template
index 33e0b0722..b454c8ac7 100644
--- a/tools/mkdocs/Dockerfile.template
+++ b/tools/mkdocs/Dockerfile.template
@@ -6,8 +6,8 @@ ARG ref=main
 #FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
-#COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+#COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/mu-repo/Dockerfile.template b/tools/mu-repo/Dockerfile.template
index 56d77d63f..3274aa7ef 100644
--- a/tools/mu-repo/Dockerfile.template
+++ b/tools/mu-repo/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 ARG name
 ARG version
diff --git a/tools/pass-audit/Dockerfile.template b/tools/pass-audit/Dockerfile.template
index 0e5bd7ecd..68b1a4ea5 100644
--- a/tools/pass-audit/Dockerfile.template
+++ b/tools/pass-audit/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=pipx / /usr/local/
 RUN <<EOF
 apt-get update
diff --git a/tools/pass-git-helper/Dockerfile.template b/tools/pass-git-helper/Dockerfile.template
index 85b164835..6ca9fd798 100644
--- a/tools/pass-git-helper/Dockerfile.template
+++ b/tools/pass-git-helper/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=pipx / /usr/local/
 RUN <<EOF
 apt-get update
diff --git a/tools/pass-import/Dockerfile.template b/tools/pass-import/Dockerfile.template
index 7619f8bc0..318b183ef 100644
--- a/tools/pass-import/Dockerfile.template
+++ b/tools/pass-import/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=pipx / /usr/local/
 RUN <<EOF
 apt-get update
diff --git a/tools/pipx/Dockerfile.template b/tools/pipx/Dockerfile.template
index 21a96f789..5a9dab09c 100644
--- a/tools/pipx/Dockerfile.template
+++ b/tools/pipx/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
diff --git a/tools/runlike/Dockerfile.template b/tools/runlike/Dockerfile.template
index df726b173..7e38970b5 100644
--- a/tools/runlike/Dockerfile.template
+++ b/tools/runlike/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/sbom2dot/Dockerfile.template b/tools/sbom2dot/Dockerfile.template
index 61e8d36a2..3117cec29 100644
--- a/tools/sbom2dot/Dockerfile.template
+++ b/tools/sbom2dot/Dockerfile.template
@@ -8,7 +8,7 @@ FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
 ARG name
 ARG version
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/sbomdiff/Dockerfile.template b/tools/sbomdiff/Dockerfile.template
index 66aac9d46..4a32746d0 100644
--- a/tools/sbomdiff/Dockerfile.template
+++ b/tools/sbomdiff/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/sbomtools/Dockerfile.template b/tools/sbomtools/Dockerfile.template
index 30ba9a77d..1adca9668 100644
--- a/tools/sbomtools/Dockerfile.template
+++ b/tools/sbomtools/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/semgrep/Dockerfile.template b/tools/semgrep/Dockerfile.template
index 4d6f93bd5..a33a4b2b6 100644
--- a/tools/semgrep/Dockerfile.template
+++ b/tools/semgrep/Dockerfile.template
@@ -8,8 +8,8 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
 ARG name
 ARG version
-#COPY --link --from=python / /
-#COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+#COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/shell-gpt/Dockerfile.template b/tools/shell-gpt/Dockerfile.template
index 1448fdd5e..5e4307a4c 100644
--- a/tools/shell-gpt/Dockerfile.template
+++ b/tools/shell-gpt/Dockerfile.template
@@ -14,7 +14,7 @@ apt-get -y install --no-install-recommends \
 EOF
 ARG name
 ARG version
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 shiv --output-file "${prefix}${target}/bin/sgpt" --console-script sgpt "shell-gpt==${version}"
diff --git a/tools/termgraph/Dockerfile.template b/tools/termgraph/Dockerfile.template
index 564998227..9c99f443f 100644
--- a/tools/termgraph/Dockerfile.template
+++ b/tools/termgraph/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/tern/Dockerfile.template b/tools/tern/Dockerfile.template
index f31ce43c8..84be57974 100644
--- a/tools/tern/Dockerfile.template
+++ b/tools/tern/Dockerfile.template
@@ -6,7 +6,7 @@ ARG ref=main
 FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
 
 FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/vexy/Dockerfile.template b/tools/vexy/Dockerfile.template
index 2deec7abe..b157afbfb 100644
--- a/tools/vexy/Dockerfile.template
+++ b/tools/vexy/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 ARG name
 ARG version
diff --git a/tools/wordcloud/Dockerfile.template b/tools/wordcloud/Dockerfile.template
index b9a2ea3c7..3c1376c4c 100644
--- a/tools/wordcloud/Dockerfile.template
+++ b/tools/wordcloud/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/yamale/Dockerfile.template b/tools/yamale/Dockerfile.template
index 26666cabe..999762ced 100644
--- a/tools/yamale/Dockerfile.template
+++ b/tools/yamale/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update
diff --git a/tools/yamllint/Dockerfile.template b/tools/yamllint/Dockerfile.template
index 346f3ccbb..38214749b 100644
--- a/tools/yamllint/Dockerfile.template
+++ b/tools/yamllint/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update