diff --git a/Justfile b/Justfile
index 4c1e2d9c7b3..9028dbf958a 100644
--- a/Justfile
+++ b/Justfile
@@ -55,6 +55,10 @@ run-booted-home image="" target="" version="":
 build-iso image="" target="" version="":
     @{{ project_root }}/scripts/build-iso.sh {{ image }} {{ target }} {{ version }}
 
+# Create ISO from local dev build image - use build-container-installer:main
+build-iso-installer-main image="" target="" version="":
+    @{{ project_root }}/scripts/build-iso-intstaller-main.sh {{ image }} {{ target }} {{ version }}
+
 # Run ISO from local dev build image
 run-iso image="" target="" version="":
     @{{ project_root }}/scripts/run-iso.sh {{ image }} {{ target }} {{ version }}
diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
index 58aac61bae1..b89749711fb 100644
--- a/build_files/base/build-base.sh
+++ b/build_files/base/build-base.sh
@@ -15,6 +15,6 @@ set -ouex pipefail
 . /tmp/build/bluefin-changes.sh
 . /tmp/build/aurora-changes.sh
 . /tmp/build/branding.sh
-. /tmp/build/initramfs.sh
 . /tmp/build/bootc.sh
+. /tmp/build/initramfs.sh
 . /tmp/build/cleanup.sh
diff --git a/packages.json b/packages.json
index 07310e2dde1..4b8eff9091c 100644
--- a/packages.json
+++ b/packages.json
@@ -33,7 +33,6 @@
 				"samba-winbind-clients",
 				"samba-winbind-modules",
 				"samba",
-				"sl",
 				"solaar",
 				"stress-ng",
 				"tailscale",
diff --git a/scripts/build-iso-intstaller-main.sh b/scripts/build-iso-intstaller-main.sh
new file mode 100755
index 00000000000..e6c4505050c
--- /dev/null
+++ b/scripts/build-iso-intstaller-main.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/bash
+#shellcheck disable=SC2154
+
+if [[ -z ${project_root} ]]; then
+    project_root=$(git rev-parse --show-toplevel)
+fi
+
+# Common Build ISO
+# shellcheck disable=SC1091
+. "${project_root}/scripts/common-build-iso.sh"
+
+if [[ ${container_mgr} =~ "podman" ]]; then
+    api_socket=/run/podman/podman.sock
+elif [[ ${container_mgr} =~ "docker" ]]; then
+    api_socket=/var/run/docker.sock
+fi
+
+# Make ISO
+${container_mgr} run --rm --privileged  \
+    --volume "${api_socket}":/var/run/docker.sock \
+    --volume "${workspace}"/scripts/files/build-iso-makefile-patch:/build-container-installer/container/Makefile \
+    --volume "${workspace}/${flatpak_dir_shortname}":"/build-container-installer/${flatpak_dir_shortname}" \
+    --volume "${workspace}"/scripts/files/output:/build-container-installer/build  \
+    ghcr.io/jasonn3/build-container-installer:main \
+    ARCH="x86_64" \
+    ENABLE_CACHE_DNF="false" \
+    ENABLE_CACHE_SKOPEO="false" \
+    ENABLE_FLATPAK_DEPENDENCIES="false" \
+    ENROLLMENT_PASSWORD="ublue-os" \
+    FLATPAK_REMOTE_REFS_DIR="${flatpak_dir_shortname}" \
+    IMAGE_NAME="${tag}" \
+    IMAGE_REPO="localhost" \
+    IMAGE_TAG="${version}" \
+    ISO_NAME="build/${tag}-${version}.iso" \
+    SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \
+    VARIANT="${variant}" \
+    VERSION="${version}"
\ No newline at end of file