diff --git a/@template/Dockerfile.template b/@template/Dockerfile.template
index db67d74e74..0f123b79fb 100644
--- a/@template/Dockerfile.template
+++ b/@template/Dockerfile.template
@@ -1,15 +1,17 @@
 #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/rust:latest AS rust
+#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/nodejs:latest AS nodejs
+#FROM ghcr.io/uniget-org/tools/npm:latest AS npm
 
-#FROM ghcr.io/uniget-org/tools/go:${ref} AS go
-#FROM ghcr.io/uniget-org/tools/rust:${ref} AS rust
-#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/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
 
diff --git a/tools/Dockerfile.tail b/tools/Dockerfile.tail
index 71a45f04a9..4cc6a9a7ec 100644
--- a/tools/Dockerfile.tail
+++ b/tools/Dockerfile.tail
@@ -15,9 +15,7 @@ ARG name
 ARG version
 ARG deps
 ARG tags
-ARG prefix_override=/uniget_bootstrap
-ENV prefix=${prefix_override}
-COPY --from=prepare ${prefix} /
+COPY --from=prepare /uniget_bootstrap /
 LABEL org.opencontainers.image.source="https://github.com/uniget-org/tools" \
       org.opencontainers.image.ref.name="${ref}" \
       org.opencontainers.image.title="${name}" \
diff --git a/tools/Dockerfile.template b/tools/Dockerfile.template
deleted file mode 100644
index 45e717dd59..0000000000
--- a/tools/Dockerfile.template
+++ /dev/null
@@ -1,52 +0,0 @@
-#syntax=docker/dockerfile:1.6.0
-
-ARG image=ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b
-ARG ref=main
-# INSERT FROM
-
-FROM ${image} AS base
-
-SHELL [ "bash", "-e", "-c"]
-
-COPY <<no-recommends <<no-suggests /etc/apt/apt.conf.d/
-APT::Install-Recommends "false";
-no-recommends
-APT::Install-Suggests "false";
-no-suggests
-
-RUN <<EOF
-apt-get update
-apt-get -y install \
-    curl \
-    ca-certificates \
-    jq \
-    iptables \
-    bash-completion \
-    less
-update-alternatives --set iptables /usr/sbin/iptables-legacy
-EOF
-
-# INSERT COPY
-
-RUN <<EOF
-if test -d /var/lib/uniget/post_install; then
-    mkdir -p /var/cache/uniget
-    export prefix=
-    export target=${prefix}/usr/local
-    export uniget_cache=/var/cache/uniget
-    export uniget_contrib=/var/lib/uniget/contrib
-    export uniget_manifests=/var/lib/uniget/manifests
-    FILES="$(find /var/lib/uniget/post_install -type f -name \*.sh)"
-    for FILE in ${FILES}; do
-        echo "Running post install for $(basename "${FILE}" .sh)"
-        if ! bash "${FILE}" >"${FILE}.log" 2>&1; then
-            cat "${FILE}.log"
-        fi
-    done
-fi
-rm -rf /var/cache/uniget
-EOF
-
-LABEL org.opencontainers.image.source="https://github.com/uniget-org/tools" \
-      org.opencontainers.image.description="Image generated by uniget" \
-      org.opencontainers.image.version="${ref}"
\ No newline at end of file