diff --git a/tools/lab/Dockerfile.template b/tools/lab/Dockerfile.template
index 32a8a81cd0..6d8193e813 100644
--- a/tools/lab/Dockerfile.template
+++ b/tools/lab/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 "zaquestion/lab" "v${version}" "lab_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/zaquestion/lab/releases/download/v${version}/lab_${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 \
     lab
-"${prefix}${target}/bin/lab" completion bash >"${prefix}${target}/share/bash-completion/completions/lab"
-"${prefix}${target}/bin/lab" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/lab.fish"
-"${prefix}${target}/bin/lab" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_lab"
+"${prefix}/bin/lab" completion bash >"${prefix}/share/bash-completion/completions/lab"
+"${prefix}/bin/lab" completion fish >"${prefix}/share/fish/vendor_completions.d/lab.fish"
+"${prefix}/bin/lab" completion zsh >"${prefix}/share/zsh/vendor-completions/_lab"
 EOF
\ No newline at end of file
diff --git a/tools/lazydocker/Dockerfile.template b/tools/lazydocker/Dockerfile.template
index 4030ba8df6..406174d427 100644
--- a/tools/lazydocker/Dockerfile.template
+++ b/tools/lazydocker/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 "jesseduffield/lazydocker" "v${version}" "lazydocker_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jesseduffield/lazydocker/releases/download/v${version}/lazydocker_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     lazydocker
 EOF
\ No newline at end of file
diff --git a/tools/lazygit/Dockerfile.template b/tools/lazygit/Dockerfile.template
index 39eb3e6e7d..d46ea05ab4 100644
--- a/tools/lazygit/Dockerfile.template
+++ b/tools/lazygit/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 "jesseduffield/lazygit" "v${version}" "lazygit_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/jesseduffield/lazygit/releases/download/v${version}/lazygit_${version}_Linux_${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     lazygit
 EOF
\ No newline at end of file
diff --git a/tools/lazytrivy/Dockerfile.template b/tools/lazytrivy/Dockerfile.template
index 56205f4a77..095d2d2002 100644
--- a/tools/lazytrivy/Dockerfile.template
+++ b/tools/lazytrivy/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 "owenrumney/lazytrivy" "v${version}" "lazytrivy-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/lazytrivy" \
+curl --silent --location --fail --output "${prefix}/bin/lazytrivy" \
     "https://github.com/owenrumney/lazytrivy/releases/download/v${version}/lazytrivy-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/lazytrivy"
+chmod +x "${prefix}/bin/lazytrivy"
 EOF
\ No newline at end of file
diff --git a/tools/lectl/Dockerfile.template b/tools/lectl/Dockerfile.template
index b96618e63a..424b0e1b79 100644
--- a/tools/lectl/Dockerfile.template
+++ b/tools/lectl/Dockerfile.template
@@ -1,13 +1,16 @@
 #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/lectl" \
+curl --silent --location --fail --output "${prefix}/bin/lectl" \
     "https://github.com/sahsanu/lectl/raw/v${version}/lectl"
-chmod +x "${prefix}${target}/bin/lectl"
+chmod +x "${prefix}/bin/lectl"
 EOF
\ No newline at end of file
diff --git a/tools/libcap-ng/Dockerfile.template b/tools/libcap-ng/Dockerfile.template
index 67ecb7ffec..8146e3c2fd 100644
--- a/tools/libcap-ng/Dockerfile.template
+++ b/tools/libcap-ng/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-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 \
@@ -20,12 +22,7 @@ ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/stevegrubb/libcap-ng .
 ./autogen.sh
-./configure --prefix=/opt/libcap-ng --enable-static --disable-shared --without-python
+./configure --prefix="${prefix}${target}" --enable-static --disable-shared --without-python
 make LDFLAGS=--static
 make install
-EOF
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-ARG name
-ARG version
-COPY --from=build /opt/libcap-ng/ ${prefix}${target}/
\ No newline at end of file
+EOF
\ No newline at end of file
diff --git a/tools/libcap/Dockerfile.template b/tools/libcap/Dockerfile.template
index dc50fd212a..1ade893159 100644
--- a/tools/libcap/Dockerfile.template
+++ b/tools/libcap/Dockerfile.template
@@ -1,14 +1,16 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-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 \
-        build-essential \
-        git \
-        ca-certificates
+    build-essential \
+    git \
+    ca-certificates
 EOF
 WORKDIR /tmp/libcap
 ARG name
@@ -17,19 +19,9 @@ RUN <<EOF
 check-clone https://git.kernel.org/pub/scm/libs/libcap/libcap.git "libcap-${version}"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "libcap-${version}" https://git.kernel.org/pub/scm/libs/libcap/libcap.git .
 make -C progs
-make -C progs install FAKEROOT=/usr/local
-mkdir -p \
-    /usr/local/share/man/man1 \
-    /usr/local/share/man/man8
-cp doc/capsh.1 /usr/local/share/man/man1/
-cp doc/getcap.8 /usr/local/share/man/man8/
-cp doc/getpcaps.8 /usr/local/share/man/man8/
-cp doc/setcap.8 /usr/local/share/man/man8/
-rm /usr/local/man
-rm -f /usr/local/sbin/unminimize
-EOF
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-ARG name
-ARG version
-COPY --from=build /usr/local/ ${prefix}${target}/
\ No newline at end of file
+make -C progs install
+cp doc/capsh.1 "${prefix}/share/man/man1/"
+cp doc/getcap.8 "${prefix}/share/man/man8/"
+cp doc/getpcaps.8 "${prefix}/share/man/man8/"
+cp doc/setcap.8 "${prefix}/share/man/man8/"
+EOF
\ No newline at end of file
diff --git a/tools/libcgroup/Dockerfile.template b/tools/libcgroup/Dockerfile.template
index 39dae5c45f..7b0804abe6 100644
--- a/tools/libcgroup/Dockerfile.template
+++ b/tools/libcgroup/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 \
@@ -15,10 +17,10 @@ apt-get -y install --no-install-recommends \
     flex
 EOF
 RUN <<EOF
-mkdir -p "${prefix}${target}/etc/ld.so.conf.d"
+mkdir -p "${prefix}/etc/ld.so.conf.d"
 EOF
-COPY <<EOF ${prefix}${target}/etc/ld.so.conf.d/libcgroup.conf
-${target}/lib
+COPY <<EOF ${prefix}/etc/ld.so.conf.d/libcgroup.conf
+/lib
 EOF
 WORKDIR /tmp/libcgroup
 ARG name
@@ -27,7 +29,7 @@ ARG version
 RUN <<EOF
 curl --silent --location --fail "https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz" \
 | tar --extract --gzip --strip-components 1
-./configure --prefix="${prefix}${target}" --disable-pam --disable-daemon
+./configure --prefix="${prefix}" --disable-pam --disable-daemon
 make
 make install
 EOF
diff --git a/tools/libmnl/Dockerfile.template b/tools/libmnl/Dockerfile.template
index ca8b96342c..8b12398479 100644
--- a/tools/libmnl/Dockerfile.template
+++ b/tools/libmnl/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" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -24,7 +26,7 @@ git clone --config advice.detachedHead=false --depth 1 --branch "libmnl-${versio
 EOF
 RUN <<EOF
 ./autogen.sh
-./configure --prefix="${prefix}${target}"
+./configure --prefix="${prefix}"
 make
 make install
 EOF
\ No newline at end of file
diff --git a/tools/libnftnl/Dockerfile.template b/tools/libnftnl/Dockerfile.template
index 31a774bf36..e45ac25c1b 100644
--- a/tools/libnftnl/Dockerfile.template
+++ b/tools/libnftnl/Dockerfile.template
@@ -1,11 +1,13 @@
 #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/libmnl:latest AS libmnl
 
-FROM ghcr.io/uniget-org/tools/make:${ref} AS make
-FROM ghcr.io/uniget-org/tools/libmnl:${ref} AS libmnl
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu: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 \
@@ -26,9 +28,9 @@ check-clone "https://git.netfilter.org/libnftnl" "libnftnl-${version}"
 git clone --config advice.detachedHead=false --depth 1 --branch "libnftnl-${version}" git://git.netfilter.org/libnftnl .
 EOF
 RUN <<EOF
-export PKG_CONFIG_PATH="${target}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+export PKG_CONFIG_PATH="/lib/pkgconfig:${PKG_CONFIG_PATH}"
 ./autogen.sh
-./configure --prefix="${prefix}${target}" --enable-static=yes --enable-shared=yes
+./configure --prefix="${prefix}" --enable-static=yes --enable-shared=yes
 make
 make install
 EOF
\ No newline at end of file
diff --git a/tools/lima/Dockerfile.template b/tools/lima/Dockerfile.template
index 1f3a0d41f4..b4c9345d6f 100644
--- a/tools/lima/Dockerfile.template
+++ b/tools/lima/Dockerfile.template
@@ -1,18 +1,20 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
+FROM ghcr.io/uniget-org/tools/yasu:latest AS yasu
 
-FROM ghcr.io/uniget-org/tools/yasu:${ref} AS yasu
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu: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=yasu / /
+COPY --from=yasu / /usr/local/
 RUN <<EOF
 check-github-release-asset "lima-vm/lima" "v${version}" "lima-${version}-Linux-${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-Linux-${arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
-yasu nobody "${prefix}${target}/bin/limactl" completion bash >"${prefix}${target}/share/bash-completion/completions/limactl"
-yasu nobody "${prefix}${target}/bin/limactl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/limactl.fish"
-yasu nobody "${prefix}${target}/bin/limactl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_limactl"
+| tar --extract --gzip --directory="${prefix}" --no-same-owner
+yasu nobody "${prefix}/bin/limactl" completion bash >"${prefix}/share/bash-completion/completions/limactl"
+yasu nobody "${prefix}/bin/limactl" completion fish >"${prefix}/share/fish/vendor_completions.d/limactl.fish"
+yasu nobody "${prefix}/bin/limactl" completion zsh >"${prefix}/share/zsh/vendor-completions/_limactl"
 EOF
\ No newline at end of file
diff --git a/tools/linuxkit/Dockerfile.template b/tools/linuxkit/Dockerfile.template
index 1d8a8e3fec..b36fe9209e 100644
--- a/tools/linuxkit/Dockerfile.template
+++ b/tools/linuxkit/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 "linuxkit/linuxkit" "v${version}" "linuxkit-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/linuxkit" \
+curl --silent --location --fail --output "${prefix}/bin/linuxkit" \
     "https://github.com/linuxkit/linuxkit/releases/download/v${version}/linuxkit-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/linuxkit"
+chmod +x "${prefix}/bin/linuxkit"
 EOF
\ No newline at end of file
diff --git a/tools/localizer/Dockerfile.template b/tools/localizer/Dockerfile.template
index bdcbb442d7..982a0ec737 100644
--- a/tools/localizer/Dockerfile.template
+++ b/tools/localizer/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 "getoutreach/localizer" "v${version}" "localizer_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/getoutreach/localizer/releases/download/v${version}/localizer_${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 \
     localizer
 EOF
\ No newline at end of file
diff --git a/tools/loft/Dockerfile.template b/tools/loft/Dockerfile.template
index 57e85d27a6..3939268d72 100644
--- a/tools/loft/Dockerfile.template
+++ b/tools/loft/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 "loft-sh/loft" "v${version}" "loft-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/loft" \
+curl --silent --location --fail --output "${prefix}/bin/loft" \
     "https://github.com/loft-sh/loft/releases/download/v${version}/loft-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/loft"
-"${prefix}${target}/bin/loft" completion bash >"${prefix}${target}/share/bash-completion/completions/loft"
-"${prefix}${target}/bin/loft" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/loft.fish"
-"${prefix}${target}/bin/loft" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_loft"
+chmod +x "${prefix}/bin/loft"
+"${prefix}/bin/loft" completion bash >"${prefix}/share/bash-completion/completions/loft"
+"${prefix}/bin/loft" completion fish >"${prefix}/share/fish/vendor_completions.d/loft.fish"
+"${prefix}/bin/loft" completion zsh >"${prefix}/share/zsh/vendor-completions/_loft"
 EOF
\ No newline at end of file
diff --git a/tools/logcli/Dockerfile.template b/tools/logcli/Dockerfile.template
index a7a9ec1028..7162a2ec78 100644
--- a/tools/logcli/Dockerfile.template
+++ b/tools/logcli/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,8 +12,8 @@ check-github-release-asset "grafana/loki" "v${version}" "logcli-linux-${alt_arch
 url="https://github.com/grafana/loki/releases/download/v${version}/logcli-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/logcli-linux-${alt_arch}" "${prefix}${target}/bin/logcli"
-"${prefix}${target}/bin/logcli" --completion-script-bash >"${prefix}${target}/share/bash-completion/completions/logcli"
-"${prefix}${target}/bin/logcli" --completion-script-zsh >"${prefix}${target}/share/zsh/vendor-completions/_logcli"
+unzip -q -o -d "${prefix}/bin" "${filename}"
+mv "${prefix}/bin/logcli-linux-${alt_arch}" "${prefix}/bin/logcli"
+"${prefix}/bin/logcli" --completion-script-bash >"${prefix}/share/bash-completion/completions/logcli"
+"${prefix}/bin/logcli" --completion-script-zsh >"${prefix}/share/zsh/vendor-completions/_logcli"
 EOF
\ No newline at end of file
diff --git a/tools/loki-canary/Dockerfile.template b/tools/loki-canary/Dockerfile.template
index 973b935216..0675e697a0 100644
--- a/tools/loki-canary/Dockerfile.template
+++ b/tools/loki-canary/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 "grafana/loki" "v${version}" "loki-canary-linux-${alt
 url="https://github.com/grafana/loki/releases/download/v${version}/loki-canary-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/loki-canary-linux-amd64" "${prefix}${target}/bin/loki-canary"
+unzip -q -o -d "${prefix}/bin" "${filename}"
+mv "${prefix}/bin/loki-canary-linux-amd64" "${prefix}/bin/loki-canary"
 EOF
\ No newline at end of file
diff --git a/tools/loki/Dockerfile.template b/tools/loki/Dockerfile.template
index 1997ae37ac..0b53eff513 100644
--- a/tools/loki/Dockerfile.template
+++ b/tools/loki/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 "grafana/loki" "v${version}" "loki-linux-${alt_arch}.
 url="https://github.com/grafana/loki/releases/download/v${version}/loki-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/loki-linux-${alt_arch}" "${prefix}${target}/bin/loki"
+unzip -q -o -d "${prefix}/bin" "${filename}"
+mv "${prefix}/bin/loki-linux-${alt_arch}" "${prefix}/bin/loki"
 EOF
\ No newline at end of file
diff --git a/tools/lsd/Dockerfile.template b/tools/lsd/Dockerfile.template
index e7f7f6d316..e5ca6a3806 100644
--- a/tools/lsd/Dockerfile.template
+++ b/tools/lsd/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" ]
 WORKDIR /tmp/lsd
 ARG name
 ARG version
@@ -10,9 +12,9 @@ RUN <<EOF
 check-github-release-asset "Peltoche/lsd" "${version}" "lsd-${version}-${arch}-unknown-linux-gnu.tar.gz"
 curl --silent --location --fail "https://github.com/Peltoche/lsd/releases/download/${version}/lsd-${version}-${arch}-unknown-linux-gnu.tar.gz" \
 | tar --extract --gzip --strip-components=1 --no-same-owner
-mv lsd "${prefix}${target}/bin/"
-mv lsd.1 "${prefix}${target}/share/man/man1/"
-mv autocomplete/lsd.bash-completion "${prefix}${target}/share/bash-completion/completions/lsd"
-mv autocomplete/lsd.fish "${prefix}${target}/share/fish/vendor_completions.d/"
-mv autocomplete/_lsd "${prefix}${target}/share/zsh/vendor-completions/"
+mv lsd "${prefix}/bin/"
+mv lsd.1 "${prefix}/share/man/man1/"
+mv autocomplete/lsd.bash-completion "${prefix}/share/bash-completion/completions/lsd"
+mv autocomplete/lsd.fish "${prefix}/share/fish/vendor_completions.d/"
+mv autocomplete/_lsd "${prefix}/share/zsh/vendor-completions/"
 EOF
\ No newline at end of file
diff --git a/tools/lstags/Dockerfile.template b/tools/lstags/Dockerfile.template
index c06f88b9a1..9d2f3eb037 100644
--- a/tools/lstags/Dockerfile.template
+++ b/tools/lstags/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
 check-github-release-asset "ivanilves/lstags" "v${version}" "lstags-linux-v${version}.tar.gz"
 curl --silent --location --fail "https://github.com/ivanilves/lstags/releases/download/v${version}/lstags-linux-v${version}.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/lxroot/Dockerfile.template b/tools/lxroot/Dockerfile.template
index fef905c3ba..b39df1bb9d 100644
--- a/tools/lxroot/Dockerfile.template
+++ b/tools/lxroot/Dockerfile.template
@@ -1,7 +1,5 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
 FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 AS build
 ARG name
 ARG version
@@ -18,5 +16,9 @@ git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}"
 g++ lxroot.cpp -o lxroot-static -s -Os -fomit-frame-pointer -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--gc-sections -fno-unroll-loops -fmerge-all-constants -fno-ident -Wl,-z,norelro -Wl,--build-id=none -fno-exceptions -fno-rtti -static
 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 --from=build /usr/src/lxroot/lxroot-static ${prefix}/usr/local/bin/lxroot
\ No newline at end of file
diff --git a/tools/lz4/Dockerfile.template b/tools/lz4/Dockerfile.template
index b5aa10462f..e7b8274f82 100644
--- a/tools/lz4/Dockerfile.template
+++ b/tools/lz4/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 / /
 RUN <<EOF
 apt-get update
@@ -25,5 +27,5 @@ curl --silent --show-error --location --fail "https://github.com/lz4/lz4/release
 
 make -C lib
 make -C programs LDFLAGS=-static
-make install DESTDIR="${prefix}" prefix="${target}"
+make install DESTDIR="${prefix}" prefix=""
 EOF
\ No newline at end of file