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

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

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