diff --git a/Makefile b/Makefile
index 90a732d..a9a3186 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ export NOCACHE_FLAG
 clean_logs := $(shell rm *.log 2>&1 >/dev/null || :)
 include src/macros.mk
 include src/packages.mk
-include src/packages_manual.mk
 
 DEFAULT_GOAL := default
 .PHONY: default
diff --git a/src/packages.mk b/src/packages.mk
index e1f6af7..82a59cc 100644
--- a/src/packages.mk
+++ b/src/packages.mk
@@ -121,7 +121,8 @@ out/cmake/index.json: \
 	out/make/index.json \
 	out/musl/index.json \
 	out/ninja/index.json \
-	out/openssl/index.json
+	out/openssl/index.json \
+	out/zlib/index.json
 	$(call build,core,cmake)
 
 .PHONY: elfutils
@@ -182,15 +183,11 @@ out/gcc/index.json: \
 gettext: out/gettext/index.json
 out/gettext/index.json: \
 	src/core/gettext/Containerfile \
-	out/autoconf/index.json \
-	out/automake/index.json \
 	out/binutils/index.json \
 	out/busybox/index.json \
 	out/gcc/index.json \
-	out/m4/index.json \
 	out/make/index.json \
 	out/musl/index.json \
-	out/perl/index.json \
 	out/libxml2/index.json
 	$(call build,core,gettext)
 
@@ -253,6 +250,23 @@ out/linux-headers/index.json: \
 	out/stage3/index.json
 	$(call build,core,linux-headers)
 
+.PHONY: llvm
+llvm: out/llvm/index.json
+out/llvm/index.json: \
+	src/core/llvm/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/ninja/index.json \
+	out/openssl/index.json \
+	out/py-setuptools/index.json \
+	out/python/index.json \
+	out/zlib/index.json
+	$(call build,core,llvm)
+
 .PHONY: m4
 m4: out/m4/index.json
 out/m4/index.json: \
@@ -394,6 +408,27 @@ out/python/index.json: \
 	out/zlib/index.json
 	$(call build,core,python)
 
+.PHONY: rust
+rust: out/rust/index.json
+out/rust/index.json: \
+	src/core/rust/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/gcc/index.json \
+	out/libunwind/index.json \
+	out/llvm/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/py-setuptools/index.json \
+	out/python/index.json \
+	out/zlib/index.json
+	$(call build,core,rust)
+
 .PHONY: sed
 sed: out/sed/index.json
 out/sed/index.json: \
diff --git a/src/packages.sh b/src/packages.sh
index 43b622e..c79e904 100755
--- a/src/packages.sh
+++ b/src/packages.sh
@@ -4,8 +4,6 @@
 # Please replace it with a script in a near universally pre-installed
 # language like python
 
-manual_targets="rust llvm"
-
 gen_deps() {
     local container_file=${1?}
     local dependencies=$( \
@@ -30,7 +28,6 @@ printf "\tsrc/packages.sh > src/packages.mk\n\n"
 bs='\'
 for container_file in $(find src/*/*/Containerfile); do
     package=$(basename $(dirname ${container_file}))
-    [[ "$manual_targets" =~ "$package" ]] && continue
     group=$(basename $(dirname $(dirname ${container_file})))
     deps=$(gen_deps "${container_file}")
     printf ".PHONY: ${package}\n${package}: out/${package}/index.json\n"
diff --git a/src/packages_manual.mk b/src/packages_manual.mk
deleted file mode 100644
index 3e22390..0000000
--- a/src/packages_manual.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-out/llvm13/index.json: \
-	out/gcc/index.json \
-	out/python/index.json \
-	out/py-setuptools/index.json \
-	out/perl/index.json \
-	out/binutils/index.json \
-	out/cmake/index.json \
-	out/ninja/index.json \
-	out/busybox/index.json \
-	out/musl/index.json
-	$(call build,core,llvm,13.0.1)
-
-out/llvm/index.json: \
-	out/gcc/index.json \
-	out/python/index.json \
-	out/py-setuptools/index.json \
-	out/perl/index.json \
-	out/binutils/index.json \
-	out/cmake/index.json \
-	out/ninja/index.json \
-	out/busybox/index.json \
-	out/musl/index.json
-	$(call build,core,llvm)
-	$(BUILDER) tag $(REGISTRY)/llvm $(REGISTRY)/llvm:16
-	$(BUILDER) tag $(REGISTRY)/llvm $(REGISTRY)/llvm:16.0.6
-
-out/rust1.54/index.json: \
-	out/gcc/index.json \
-	out/bash/index.json \
-	out/zlib/index.json \
-	out/python/index.json \
-	out/py-setuptools/index.json \
-	out/perl/index.json \
-	out/libunwind/index.json \
-	out/pkgconf/index.json \
-	out/llvm13/index.json \
-	out/binutils/index.json \
-	out/cmake/index.json \
-	out/make/index.json \
-	out/busybox/index.json \
-	out/musl/index.json
-	$(call build,core,rust,1.54.0,bootstrap-package)
-
-out/rust1.55/index.json: out/rust1.54/index.json
-	$(call build,core,rust,1.55.0,package,--build-arg BUILD_VERSION=1.54.0)
-
-out/rust1.56/index.json: out/rust1.55/index.json
-	$(call build,core,rust,1.56.0,package,--build-arg BUILD_VERSION=1.55.0)
-
-out/rust1.57/index.json: out/rust1.56/index.json
-	$(call build,core,rust,1.57.0,package,--build-arg BUILD_VERSION=1.56.0)
-
-out/rust1.58/index.json: out/rust1.57/index.json
-	$(call build,core,rust,1.58.0,package,--build-arg BUILD_VERSION=1.57.0)
-
-out/rust1.59/index.json: out/rust1.58/index.json
-	$(call build,core,rust,1.59.0,package,--build-arg BUILD_VERSION=1.58.0)
-
-out/rust1.60/index.json: out/rust1.59/index.json
-	$(call build,core,rust,1.60.0,package,--build-arg BUILD_VERSION=1.59.0)
-
-out/rust1.61/index.json: out/rust1.60/index.json
-	$(call build,core,rust,1.61.0,package,--build-arg BUILD_VERSION=1.60.0)
-
-out/rust1.62/index.json: out/rust1.61/index.json
-	$(call build,core,rust,1.62.0,package,--build-arg BUILD_VERSION=1.61.0)
-
-out/rust1.63/index.json: out/rust1.62/index.json
-	$(call build,core,rust,1.63.0,package,--build-arg BUILD_VERSION=1.62.0)
-
-out/rust1.64/index.json: out/rust1.63/index.json
-	$(call build,core,rust,1.64.0,package,--build-arg BUILD_VERSION=1.63.0)
-
-out/rust1.65/index.json: out/rust1.64/index.json
-	$(call build,core,rust,1.65.0,package,--build-arg BUILD_VERSION=1.64.0)
-
-out/rust1.66/index.json: out/rust1.65/index.json
-	$(call build,core,rust,1.66.0,package,--build-arg BUILD_VERSION=1.65.0)
-
-out/rust1.67/index.json: out/rust1.66/index.json
-	$(call build,core,rust,1.67.0,package,--build-arg BUILD_VERSION=1.66.0)
-
-out/rust1.68/index.json: out/rust1.67/index.json
-	$(call build,core,rust,1.68.0,package,--build-arg BUILD_VERSION=1.67.0)
-
-out/rust1.69/index.json: out/rust1.68/index.json out/llvm/index.json
-	$(call build,core,rust,1.69.0,package,--build-arg BUILD_VERSION=1.68.0 --build-arg LLVM_VERSION=16)
-
-out/rust1.70/index.json: out/rust1.69/index.json
-	$(call build,core,rust,1.70.0,package,--build-arg BUILD_VERSION=1.69.0 --build-arg LLVM_VERSION=16)
-
-out/rust1.71/index.json: out/rust1.70/index.json
-	$(call build,core,rust,1.71.0,package,--build-arg BUILD_VERSION=1.70.0 --build-arg LLVM_VERSION=16)
-
-out/rust1.72/index.json: out/rust1.71/index.json
-	$(call build,core,rust,1.72.0,package,--build-arg BUILD_VERSION=1.71.0 --build-arg LLVM_VERSION=16)
-
-out/rust1.73/index.json: out/rust1.72/index.json
-	$(call build,core,rust,1.73.0,package,--build-arg BUILD_VERSION=1.72.0 --build-arg LLVM_VERSION=16)
-
-out/rust/index.json: out/rust1.73/index.json src/core/rust/Containerfile
-	$(call build,core,rust,1.74.0,package,--build-arg BUILD_VERSION=1.73.0 --build-arg LLVM_VERSION=16)
-
-.PHONY: rust
-rust: out/rust/index.json