diff --git a/tools/hadolint/Dockerfile.template b/tools/hadolint/Dockerfile.template
index 4626102152..732e8823e2 100644
--- a/tools/hadolint/Dockerfile.template
+++ b/tools/hadolint/Dockerfile.template
@@ -1,13 +1,15 @@
 #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 "hadolint/hadolint" "v${version}" "hadolint-Linux-${arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/hadolint" \
+curl --silent --location --fail --output "${prefix}/bin/hadolint" \
     "https://github.com/hadolint/hadolint/releases/download/v${version}/hadolint-Linux-${arch}"
-chmod +x "${prefix}${target}/bin/hadolint"
+chmod +x "${prefix}/bin/hadolint"
 EOF
\ No newline at end of file
diff --git a/tools/has/Dockerfile.template b/tools/has/Dockerfile.template
index b8bd34d878..ac918759fe 100644
--- a/tools/has/Dockerfile.template
+++ b/tools/has/Dockerfile.template
@@ -1,12 +1,14 @@
 #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
-curl --silent --location --fail --output "${prefix}${target}/bin/has" \
+curl --silent --location --fail --output "${prefix}/bin/has" \
     "https://github.com/kdabir/has/raw/v${version}/has"
-chmod +x "${prefix}${target}/bin/has"
+chmod +x "${prefix}/bin/has"
 EOF
\ No newline at end of file
diff --git a/tools/havener/Dockerfile.template b/tools/havener/Dockerfile.template
index 6bf158d871..8a45cd2a33 100644
--- a/tools/havener/Dockerfile.template
+++ b/tools/havener/Dockerfile.template
@@ -1,16 +1,18 @@
 #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 "homeport/havener" "v${version}" "havener_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/homeport/havener/releases/download/v${version}/havener_${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 \
     havener
-"${prefix}${target}/bin/havener" completion bash >"${prefix}${target}/share/bash-completion/completions/havener"
-"${prefix}${target}/bin/havener" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/havener.fish"
-"${prefix}${target}/bin/havener" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_havener"
+"${prefix}/bin/havener" completion bash >"${prefix}/share/bash-completion/completions/havener"
+"${prefix}/bin/havener" completion fish >"${prefix}/share/fish/vendor_completions.d/havener.fish"
+"${prefix}/bin/havener" completion zsh >"${prefix}/share/zsh/vendor-completions/_havener"
 EOF
\ No newline at end of file
diff --git a/tools/hcloud/Dockerfile.template b/tools/hcloud/Dockerfile.template
index 55f49ca297..881dce7fa4 100644
--- a/tools/hcloud/Dockerfile.template
+++ b/tools/hcloud/Dockerfile.template
@@ -1,16 +1,18 @@
 #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 "hetznercloud/cli" "v${version}" "hcloud-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/hetznercloud/cli/releases/download/v${version}/hcloud-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     hcloud
-"${prefix}${target}/bin/hcloud" completion bash >"${prefix}${target}/share/bash-completion/completions/hcloud"
-"${prefix}${target}/bin/hcloud" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/hcloud.fish"
-"${prefix}${target}/bin/hcloud" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_hcloud"
+"${prefix}/bin/hcloud" completion bash >"${prefix}/share/bash-completion/completions/hcloud"
+"${prefix}/bin/hcloud" completion fish >"${prefix}/share/fish/vendor_completions.d/hcloud.fish"
+"${prefix}/bin/hcloud" completion zsh >"${prefix}/share/zsh/vendor-completions/_hcloud"
 EOF
\ No newline at end of file
diff --git a/tools/helm-plugins/Dockerfile.template b/tools/helm-plugins/Dockerfile.template
index 7ebdd817d4..ed43df19f6 100644
--- a/tools/helm-plugins/Dockerfile.template
+++ b/tools/helm-plugins/Dockerfile.template
@@ -1,17 +1,19 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/helm:latest AS helm
 
-FROM ghcr.io/uniget-org/tools/helm:${ref} AS helm
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu: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=helm / /
 RUN <<EOF
-echo "export HELM_PLUGINS=${target}/share/helm/plugins" >"${prefix}${target}/etc/profile.d/helm-plugins.sh"
+echo "export HELM_PLUGINS=/share/helm/plugins" >"${prefix}/etc/profile.d/helm-plugins.sh"
 
-export HELM_PLUGINS=${prefix}${target}/share/helm/plugins
+export HELM_PLUGINS=${prefix}/share/helm/plugins
 
 plugins=(
     https://github.com/mstrzele/helm-edit
@@ -50,11 +52,11 @@ for url in "${plugins[@]}"; do
         "${HELM_PLUGINS}/${name}/*.md"
 done
 
-helm diff completion bash >"${prefix}${target}/share/bash-completion/completions/helm-diff"
-helm diff completion fish >"${prefix}${target}/share/fish/vendor_completions.d/helm-diff.fish"
-helm diff completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_helm-diff"
+helm diff completion bash >"${prefix}/share/bash-completion/completions/helm-diff"
+helm diff completion fish >"${prefix}/share/fish/vendor_completions.d/helm-diff.fish"
+helm diff completion zsh >"${prefix}/share/zsh/vendor-completions/_helm-diff"
 
-helm sigstore completion bash >"${prefix}${target}/share/bash-completion/completions/helm-sigstore"
-helm sigstore completion fish >"${prefix}${target}/share/fish/vendor_completions.d/helm-sigstore.fish"
-helm sigstore completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_helm-sigstore"
+helm sigstore completion bash >"${prefix}/share/bash-completion/completions/helm-sigstore"
+helm sigstore completion fish >"${prefix}/share/fish/vendor_completions.d/helm-sigstore.fish"
+helm sigstore completion zsh >"${prefix}/share/zsh/vendor-completions/_helm-sigstore"
 EOF
\ No newline at end of file
diff --git a/tools/helm/Dockerfile.template b/tools/helm/Dockerfile.template
index f1f43989b7..ab78378a6a 100644
--- a/tools/helm/Dockerfile.template
+++ b/tools/helm/Dockerfile.template
@@ -1,15 +1,17 @@
 #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
 curl --silent --location --fail "https://get.helm.sh/helm-v${version}-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     linux-${alt_arch}/helm
-"${prefix}${target}/bin/helm" completion bash >"${prefix}${target}/share/bash-completion/completions/helm"
-"${prefix}${target}/bin/helm" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/helm.fish"
-"${prefix}${target}/bin/helm" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_helm"
+"${prefix}/bin/helm" completion bash >"${prefix}/share/bash-completion/completions/helm"
+"${prefix}/bin/helm" completion fish >"${prefix}/share/fish/vendor_completions.d/helm.fish"
+"${prefix}/bin/helm" completion zsh >"${prefix}/share/zsh/vendor-completions/_helm"
 EOF
diff --git a/tools/helmfile/Dockerfile.template b/tools/helmfile/Dockerfile.template
index bb871935bf..77a652e733 100644
--- a/tools/helmfile/Dockerfile.template
+++ b/tools/helmfile/Dockerfile.template
@@ -1,18 +1,21 @@
 #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 "roboll/helmfile" "v${version}" "helmfile_linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/helmfile" \
+curl --silent --location --fail --output "${prefix}/bin/helmfile" \
     "https://github.com/roboll/helmfile/releases/download/v${version}/helmfile_linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/helmfile"
-curl --silent --location --fail --output "${prefix}${target}/share/bash-completion/completions/helmfile" \
+chmod +x "${prefix}/bin/helmfile"
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/helmfile" \
     "https://github.com/roboll/helmfile/raw/v${version}/autocomplete/helmfile_bash_autocomplete"
-curl --silent --location --fail --output "${prefix}${target}/share/zsh/vendor-completions/_helmfile" \
+curl --silent --location --fail --output "${prefix}/share/zsh/vendor-completions/_helmfile" \
     "https://github.com/roboll/helmfile/raw/v${version}/autocomplete/helmfile_zsh_autocomplete"
 EOF
\ No newline at end of file
diff --git a/tools/helmify/Dockerfile.template b/tools/helmify/Dockerfile.template
index 30cc2936c1..56232d3c13 100644
--- a/tools/helmify/Dockerfile.template
+++ b/tools/helmify/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
@@ -25,5 +27,5 @@ check-github-release-asset "arttor/helmify" "v${version}" "helmify_Linux_${arch_
 
 echo "### Downloading helmify ${version}"
 curl --silent --location --fail "https://github.com/arttor/helmify/releases/download/v${version}/helmify_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
\ No newline at end of file
diff --git a/tools/hetzner-k3s/Dockerfile.template b/tools/hetzner-k3s/Dockerfile.template
index c92c04f158..8775e6912a 100644
--- a/tools/hetzner-k3s/Dockerfile.template
+++ b/tools/hetzner-k3s/Dockerfile.template
@@ -1,20 +1,22 @@
 #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 "vitobotta/hetzner-k3s" "v${version}" "hetzner-k3s-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/hetzner-k3s" \
+curl --silent --location --fail --output "${prefix}/bin/hetzner-k3s" \
     "https://github.com/vitobotta/hetzner-k3s/releases/download/v${version}/hetzner-k3s-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/hetzner-k3s"
+chmod +x "${prefix}/bin/hetzner-k3s"
 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/hexyl/Dockerfile.template b/tools/hexyl/Dockerfile.template
index 72862b33c1..aef2a47638 100644
--- a/tools/hexyl/Dockerfile.template
+++ b/tools/hexyl/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
@@ -23,9 +25,9 @@ check-github-release-asset "sharkdp/hexyl" "v${version}" "hexyl-v${version}-${ar
 
 echo "### Downloading hexyl ${version}"
 curl --silent --location --fail "https://github.com/sharkdp/hexyl/releases/download/v${version}/hexyl-v${version}-${arch}-unknown-linux-${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 \
     "hexyl-v${version}-${arch}-unknown-linux-${suffix}/hexyl" \
     "hexyl-v${version}-${arch}-unknown-linux-${suffix}/hexyl.1"
 
-mv "${prefix}${target}/bin/hexyl.1" "${prefix}${target}/share/man/man1/"
+mv "${prefix}/bin/hexyl.1" "${prefix}/share/man/man1/"
 EOF
\ No newline at end of file
diff --git a/tools/htmx/Dockerfile.template b/tools/htmx/Dockerfile.template
index 648f97150b..d5ad3ae9ac 100644
--- a/tools/htmx/Dockerfile.template
+++ b/tools/htmx/Dockerfile.template
@@ -1,13 +1,15 @@
 #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-download "https://github.com/bigskysoftware/htmx/blob/v${version}/dist/htmx.min.js"
-mkdir -p "${prefix}${target}/share/htmx"
-curl --silent --location --fail --output "${prefix}${target}/share/htmx/htmx.min.js" \
+mkdir -p "${prefix}/share/htmx"
+curl --silent --location --fail --output "${prefix}/share/htmx/htmx.min.js" \
     "https://github.com/bigskysoftware/htmx/blob/v${version}/dist/htmx.min.js"
 EOF
\ No newline at end of file
diff --git a/tools/httpie/Dockerfile.template b/tools/httpie/Dockerfile.template
index a6bf81186c..fd0a84470d 100644
--- a/tools/httpie/Dockerfile.template
+++ b/tools/httpie/Dockerfile.template
@@ -1,13 +1,15 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/python:latest AS python
+FROM ghcr.io/uniget-org/tools/shiv:latest AS shiv
 
-#FROM ghcr.io/uniget-org/tools/python:${ref} AS python
-FROM ghcr.io/uniget-org/tools/shiv:${ref} AS shiv
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 #COPY --link --from=python / /usr/local/
-COPY --link --from=shiv / /
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -18,10 +20,10 @@ EOF
 ARG name
 ARG version
 RUN <<EOF
-shiv --output-file "${prefix}${target}/bin/http" --console-script http "httpie==${version}"
+shiv --output-file "${prefix}/bin/http" --console-script http "httpie==${version}"
 
-curl --silent --location --fail --output "${prefix}${target}/share/bash-completion/completions/http" \
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/http" \
     "https://github.com/httpie/cli/raw/${version}/extras/httpie-completion.bash"
-curl --silent --location --fail --output "${prefix}${target}/share/fish/vendor_completions.d/http.fish" \
+curl --silent --location --fail --output "${prefix}/share/fish/vendor_completions.d/http.fish" \
     "https://github.com/httpie/cli/raw/${version}/extras/httpie-completion.fish"
 EOF
\ No newline at end of file
diff --git a/tools/httpx/Dockerfile.template b/tools/httpx/Dockerfile.template
index 7d490ca502..0560671b91 100644
--- a/tools/httpx/Dockerfile.template
+++ b/tools/httpx/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
@@ -10,6 +12,6 @@ check-github-release-asset "projectdiscovery/httpx" "v${version}" "httpx_${versi
 url="https://github.com/projectdiscovery/httpx/releases/download/v${version}/httpx_${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}" \
     httpx
 EOF
\ No newline at end of file
diff --git a/tools/hub-tool/Dockerfile.template b/tools/hub-tool/Dockerfile.template
index fc9c71d68b..1aa45e4482 100644
--- a/tools/hub-tool/Dockerfile.template
+++ b/tools/hub-tool/Dockerfile.template
@@ -1,13 +1,15 @@
 #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 "docker/hub-tool" "v${version}" "hub-tool-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/docker/hub-tool/releases/download/v${version}/hub-tool-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 \
     hub-tool/hub-tool
 EOF
\ No newline at end of file
diff --git a/tools/hub/Dockerfile.template b/tools/hub/Dockerfile.template
index 2c785b912b..19fbccee65 100644
--- a/tools/hub/Dockerfile.template
+++ b/tools/hub/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
@@ -9,16 +12,16 @@ ARG version
 RUN <<EOF
 check-github-release-asset "github/hub" "v${version}" "hub-linux-${alt_arch}-${version}.tgz"
 curl --silent --location --fail "https://github.com/GrantBirki/hub/releases/download/v${version}/hub-linux-${alt_arch}-${version}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}" --strip-components=1 --no-same-owner
+| tar --extract --gzip --directory="${prefix}" --strip-components=1 --no-same-owner
 rm -f \
-    "${prefix}${target}/LICENSE" \
-    "${prefix}${target}/install" \
-    "${prefix}${target}/README.md" \
-    "${prefix}${target}/share/man/man1/*.txt"
-mv "${prefix}${target}/etc/hub.bash_completion.sh" "${prefix}${target}/share/bash-completion/completions/hub"
-mv "${prefix}${target}/etc/hub.fish_completion"    "${prefix}${target}/share/fish/vendor_completions.d/hub.fish"
-mv "${prefix}${target}/etc/hub.zsh_completion"     "${prefix}${target}/share/zsh/vendor-completions/_hub"
+    "${prefix}/LICENSE" \
+    "${prefix}/install" \
+    "${prefix}/README.md" \
+    "${prefix}/share/man/man1/*.txt"
+mv "${prefix}/etc/hub.bash_completion.sh" "${prefix}/share/bash-completion/completions/hub"
+mv "${prefix}/etc/hub.fish_completion"    "${prefix}/share/fish/vendor_completions.d/hub.fish"
+mv "${prefix}/etc/hub.zsh_completion"     "${prefix}/share/zsh/vendor-completions/_hub"
 rm -rf \
-    "${prefix}${target}/share/doc/hub-doc" \
-    "${prefix}${target}/share/vim"
+    "${prefix}/share/doc/hub-doc" \
+    "${prefix}/share/vim"
 EOF
\ No newline at end of file
diff --git a/tools/hubble/Dockerfile.template b/tools/hubble/Dockerfile.template
index dabc6bbe23..ee2998df50 100644
--- a/tools/hubble/Dockerfile.template
+++ b/tools/hubble/Dockerfile.template
@@ -1,15 +1,17 @@
 #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 "cilium/hubble" "v${version}" "hubble-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cilium/hubble/releases/download/v${version}/hubble-linux-${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
-"${prefix}${target}/bin/hubble" completion bash >"${prefix}${target}/share/bash-completion/completions/hubble"
-"${prefix}${target}/bin/hubble" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/hubble.fish"
-"${prefix}${target}/bin/hubble" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_hubble"
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
+"${prefix}/bin/hubble" completion bash >"${prefix}/share/bash-completion/completions/hubble"
+"${prefix}/bin/hubble" completion fish >"${prefix}/share/fish/vendor_completions.d/hubble.fish"
+"${prefix}/bin/hubble" completion zsh >"${prefix}/share/zsh/vendor-completions/_hubble"
 EOF
\ No newline at end of file
diff --git a/tools/huber/Dockerfile.template b/tools/huber/Dockerfile.template
index 4eec5e554c..15c9fd8b02 100644
--- a/tools/huber/Dockerfile.template
+++ b/tools/huber/Dockerfile.template
@@ -1,32 +1,43 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+#FROM ghcr.io/uniget-org/tools/rust:latest AS rust
 
-FROM ghcr.io/uniget-org/tools/rust:${ref} AS rust
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-COPY --from=rust / /
-ARG DEBIAN_FRONTEND=noninteractive
-RUN <<EOF
-apt-get update
-apt-get -y install --no-install-recommends \
-    build-essential
-EOF
-WORKDIR /tmp/github.com/innobead/huber
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
+#COPY --from=rust / /usr/local/
+#ARG DEBIAN_FRONTEND=noninteractive
+#RUN <<EOF
+#apt-get update
+#apt-get -y install --no-install-recommends \
+#    build-essential \
+#    libarchive13 \
+#    libarchive-dev \
+#    libssl-dev \
+#    liblzma-dev \
+#    libbz2-dev \
+#    libzstd-dev \
+#    nettle-dev \
+#    liblz4-dev \
+#    libxml2-dev \
+#    pkg-config
+#EOF
+#WORKDIR /tmp/github.com/innobead/huber
 ARG name
 ARG version
+#RUN <<EOF
+#git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/innobead/huber .
+#export CARGO_HOME=/usr/local/cargo
+#export RUSTUP_HOME=/usr/local/rustup
+#export RUSTFLAGS='-C target-feature=+crt-static -llzma -lbz2 -lzstd -lnettle -llz4 -lxml2'
+#cargo build --target x86_64-unknown-linux-gnu --release --workspace --exclude=huber-generator
+#cp target/x86_64-unknown-linux-gnu/release/huber "${prefix}/bin/"
+#EOF
 RUN <<EOF
-apt-get update
-apt-get -y install --no-install-recommends \
-    libarchive13 \
-    libarchive-dev \
-    libssl-dev \
-    pkg-config
-EOF
-RUN <<EOF
-source "${target}/etc/profile.d/cargo.sh"
-git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/innobead/huber .
-export RUSTFLAGS='-C target-feature=+crt-static'
-cargo build --target x86_64-unknown-linux-gnu --release --workspace --exclude=huber-generator
-cp target/x86_64-unknown-linux-gnu/release/huber "${prefix}${target}/bin/"
+check-github-release-asset "innobead/huber" "v${version}" "huber-linux-${alt_arch}"
+curl --silent --location --fail --output "${prefix}${target}/bin/huber" \
+    "https://github.com/innobead/huber/releases/download/v${version}/huber-linux-${alt_arch}"
+chmod +x "${prefix}${target}/bin/huber"
 EOF
diff --git a/tools/huber/manifest.yaml b/tools/huber/manifest.yaml
index 5732a388d2..fc637f751c 100644
--- a/tools/huber/manifest.yaml
+++ b/tools/huber/manifest.yaml
@@ -11,6 +11,11 @@ tags:
 - management
 homepage: https://github.com/innobead/huber
 description: Package Manager for GitHub repos
+messages:
+  usage: |
+    Install the following packages:
+    - libarchive-dev
+    - http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb
 renovate:
   datasource: github-releases
   package: innobead/huber
diff --git a/tools/hugo/Dockerfile.template b/tools/hugo/Dockerfile.template
index 1df5b5de97..446c6d7365 100644
--- a/tools/hugo/Dockerfile.template
+++ b/tools/hugo/Dockerfile.template
@@ -1,17 +1,19 @@
 #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 "gohugoio/hugo" "v${version}" "hugo_extended_${version}_Linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/gohugoio/hugo/releases/download/v${version}/hugo_extended_${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 \
     hugo
-"${prefix}${target}/bin/hugo" gen man --dir "${prefix}${target}/share/man/man1"
-"${prefix}${target}/bin/hugo" completion bash >"${prefix}${target}/share/bash-completion/completions/hugo"
-"${prefix}${target}/bin/hugo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/hugo.fish"
-"${prefix}${target}/bin/hugo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_hugo"
+"${prefix}/bin/hugo" gen man --dir "${prefix}/share/man/man1"
+"${prefix}/bin/hugo" completion bash >"${prefix}/share/bash-completion/completions/hugo"
+"${prefix}/bin/hugo" completion fish >"${prefix}/share/fish/vendor_completions.d/hugo.fish"
+"${prefix}/bin/hugo" completion zsh >"${prefix}/share/zsh/vendor-completions/_hugo"
 EOF
\ No newline at end of file
diff --git a/tools/hurl/Dockerfile.template b/tools/hurl/Dockerfile.template
index 9b10586ad4..bb3750ae2a 100644
--- a/tools/hurl/Dockerfile.template
+++ b/tools/hurl/Dockerfile.template
@@ -1,16 +1,18 @@
 #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 "Orange-OpenSource/hurl" "${version}" "hurl-${version}-${arch}-unknown-linux-gnu.tar.gz"
 curl --silent --location --fail "https://github.com/Orange-OpenSource/hurl/releases/download/${version}/hurl-${version}-${arch}-unknown-linux-gnu.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
 mv \
-    "${prefix}${target}/bin/hurl.1.gz" \
-    "${prefix}${target}/bin/hurlfmt.1.gz" \
-    "${prefix}${target}/share/man/man1/"
+    "${prefix}/bin/hurl.1.gz" \
+    "${prefix}/bin/hurlfmt.1.gz" \
+    "${prefix}/share/man/man1/"
 EOF
\ No newline at end of file
diff --git a/tools/hyperfine/Dockerfile.template b/tools/hyperfine/Dockerfile.template
index d26066f538..874dd46a7f 100644
--- a/tools/hyperfine/Dockerfile.template
+++ b/tools/hyperfine/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
@@ -23,13 +25,13 @@ check-github-release-asset "sharkdp/hyperfine" "v${version}" "hyperfine-v${versi
 
 echo "### Downloading hyperfine ${version}"
 curl --silent --location --fail "https://github.com/sharkdp/hyperfine/releases/download/v${version}/hyperfine-v${version}-${arch}-unknown-linux-${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 \
     "hyperfine-v${version}-${arch}-unknown-linux-${suffix}/hyperfine" \
     "hyperfine-v${version}-${arch}-unknown-linux-${suffix}/autocomplete"
 
 echo "### Installing completion"
-cp "${prefix}${target}/bin/autocomplete/hyperfine.bash" "${prefix}${target}/share/bash-completion/completions/hyperfine"
-cp "${prefix}${target}/bin/autocomplete/hyperfine.fish" "${prefix}${target}/share/fish/vendor_completions.d/hyperfine.fish"
-cp "${prefix}${target}/bin/autocomplete/_hyperfine" "${prefix}${target}/share/zsh/vendor-completions/_hyperfine"
-rm -rf "${prefix}${target}/bin/autocomplete/"
+cp "${prefix}/bin/autocomplete/hyperfine.bash" "${prefix}/share/bash-completion/completions/hyperfine"
+cp "${prefix}/bin/autocomplete/hyperfine.fish" "${prefix}/share/fish/vendor_completions.d/hyperfine.fish"
+cp "${prefix}/bin/autocomplete/_hyperfine" "${prefix}/share/zsh/vendor-completions/_hyperfine"
+rm -rf "${prefix}/bin/autocomplete/"
 EOF
\ No newline at end of file