diff --git a/Containerfile b/Containerfile
index dbd9d1d5e07..a95b44c7534 100644
--- a/Containerfile
+++ b/Containerfile
@@ -46,6 +46,7 @@ COPY etc/yum.repos.d/ /etc/yum.repos.d/
 COPY packages.json /tmp/packages.json
 COPY build.sh /tmp/build.sh
 COPY image-info.sh /tmp/image-info.sh
+COPY fetch-quadlets.sh /tmp/fetch-quadlets.sh
 # Copy ublue-update.toml to tmp first, to avoid being overwritten.
 COPY usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml
 
@@ -77,17 +78,13 @@ RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases
 RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     /tmp/build.sh && \
     /tmp/image-info.sh && \
+    /tmp/fetch-quadlets.sh && \
     pip install --prefix=/usr yafti && \
     pip install --prefix=/usr topgrade && \
     rpm-ostree install ublue-update && \
     mkdir -p /usr/etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
     cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml && \
-    mkdir -p /usr/etc/containers/systemd/users && \
-    wget -q https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container -P /usr/etc/containers/systemd/users && \
-    printf "\n\n[Install]\nWantedBy=bluefin-cli.target" >> /usr/etc/containers/systemd/users/bluefin-cli.container  && \
-    sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-cli.container && \
-    sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /usr/etc/containers/systemd/users/bluefin-cli.container && \
     if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
         systemctl enable tuned.service \
     ; fi && \
diff --git a/fetch-quadlets.sh b/fetch-quadlets.sh
new file mode 100755
index 00000000000..afa414af7de
--- /dev/null
+++ b/fetch-quadlets.sh
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+set -oue pipefail
+
+# Make Directory
+mkdir -p /usr/etc/containers/systemd/users
+
+# bluefin-cli
+wget --output-document="/usr/etc/containers/systemd/users/bluefin-cli.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container 
+printf "\n\n[Install]\nWantedBy=bluefin-cli.target" >> /usr/etc/containers/systemd/users/bluefin-cli.container
+sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-cli.container
+sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /usr/etc/containers/systemd/users/bluefin-cli.container
+
+# bluefin-dx-cli
+wget --output-document="/usr/etc/containers/systemd/users/bluefin-dx-cli.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-dx-cli.container 
+printf "\n\n[Install]\nWantedBy=bluefin-dx-cli.target" >> /usr/etc/containers/systemd/users/bluefin-cli.container
+sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-dx-cli.container
+sed -i 's/ContainerName=bluefin/ContainerName=bluefin-dx-cli/' /usr/etc/containers/systemd/users/bluefin-dx-cli.container
+
+# fedora-toolbox
+wget --output-document="/usr/etc/containers/systemd/users/fedora-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container 
+printf "\n\n[Install]\nWantedBy=fedora-toolbox.target" >> /usr/etc/containers/systemd/users/fedora-toolbox.container
+sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/fedora-toolbox.container
+sed -i 's/ContainerName=fedora-distrobox-quadlet/ContainerName=fedora-toolbox/' /usr/etc/containers/systemd/users/fedora-toolbox.container
+
+# ubuntu-toolbox
+wget --output-document="/usr/etc/containers/systemd/users/ubuntu-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container 
+printf "\n\n[Install]\nWantedBy=ubuntu-toolbox.target" >> /usr/etc/containers/systemd/users/ubuntu-toolbox.container
+sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/ubuntu-toolbox.container
+sed -i 's/ContainerName=ubuntu-distrobox-quadlet/ContainerName=ubuntu-toolbox/' /usr/etc/containers/systemd/users/ubuntu-toolbox.container
+
+# wolfi-toolbox
+wget --output-document="/usr/etc/containers/systemd/users/wolfi-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container
+printf "\n\n[Install]\nWantedBy=wolfi-toolbox.target" >> /usr/etc/containers/systemd/users/wolfi-toolbox.container
+sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/wolfi-toolbox.container
+sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-toolbox/' /usr/etc/containers/systemd/users/wolfi-toolbox.container
+
+# wolfi-dx-toolbox
+wget --output-document="/usr/etc/containers/systemd/users/wolfi-dx-toolbox.container" --quiet https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container
+printf "\n\n[Install]\nWantedBy=wolfi-dx-toolbox.target" >> /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
+sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
+sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-dx-toolbox/' /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container
+
+# Make systemd targets and restart services for topgrade
+mkdir -p /usr/lib/systemd/user
+mkdir -p /usr/share/ublue-os/bluefin-cli
+QUADLET_TARGETS=(
+    "bluefin-cli"
+    "bluefin-dx-cli"
+    "fedora-toolbox"
+    "ubuntu-toolbox"
+    "wolfi-toolbox"
+    "wolfi-dx-toolbox"
+)
+for i in "${QUADLET_TARGETS[@]}"
+do
+cat > "/usr/lib/systemd/user/${i}.target" <<EOF
+[Unit]
+Description=${i}"target for ${i} quadlet
+
+[Install]
+WantedBy=default.target
+EOF
+cat > "/usr/lib/systemd/user/${i}-update.service" <<EOF
+[Unit]
+Description=Restart ${i}.service to rebuild container
+
+[Service]
+Type=oneshot
+ExecStart=-/usr/bin/podman pull ghcr.io/ublue-os/${i}:latest
+ExecStart=-/usr/bin/systemctl --user restart ${i}.service
+EOF
+
+cat > "/usr/share/ublue-os/bluefin-cli/${i}.sh" <<EOF
+#!/bin/sh 
+ 
+if test ! -f "/run/user/\${UID}/container-entry" && test -n "\$PS1" && test \$(podman ps --all --filter name=$i | grep -q " $i\$") && test ! -f "/run/.containerenv"; then  
+    touch "/run/user/\${UID}/container-entry"  
+    exec /usr/bin/distrobox-enter $i 
+fi
+EOF
+done
\ No newline at end of file
diff --git a/just/custom.just b/just/custom.just
index 7d6af2822c2..b489f2e6a93 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -7,63 +7,7 @@ benchmark:
 
 # Configure bluefin-cli Terminal Experience
 bluefin-cli:
-    #!/usr/bin/bash
-    source /usr/lib/ujust/ujust.sh
-    printf "Set Up bluefin-cli\n"
-    printf "Would you like to use Host Terminal or Container as default Terminal?\n"
-    TERMINAL_CHOICE=$(Choose Host Container)
-    if test "$TERMINAL_CHOICE" = "Container"; then
-        printf "You have chosen Container.\nWould you like to use quadlets to manage your container?\n"
-        MANAGEMENT_CHOICE=$(Choose Quadlet Distrobox)
-    else
-        printf "You have chosen to use Host Terminal. Would you like to setup Bluefin-cli container?\n"
-        MANAGEMENT_CHOICE=$(Choose Quadlet Distrobox No)
-    fi
-    if /usr/bin/systemctl is-enabled --quiet bluefin-cli.target; then
-        printf "Bluefin quadlet is already enabled, would you like to disable it?\n"
-        DISABLE=$(Choose Yes No)
-        if test "$DISABLE" = "No"; then
-            printf "Not Disabling existing container quadlet.\n"
-            printf "Finished Bluefin-CLI setup, rerun with ujust bluefin-cli to reconfigure\n"
-            printf "Exiting...\n"
-            exit 0
-        elif test "$DISABLE" = "Yes"; then
-            printf "Disabling Bluefin-CLI\n"
-            /usr/bin/systemctl --user disable --now bluefin-cli.target
-            /usr/bin/systemctl --user stop bluefin-cli.service
-        fi
-    fi
-    if /usr/bin/env DBX_CONTAINER_MANAGER="podman" /usr/bin/distrobox-list | grep -qE "^| bluefin-cli .*"; then
-        printf "You already have a container named bluefin-cli. Would you like to destroy it?\n"
-        REBUILD=$(Choose Yes No)
-        if test "$REBUILD" = "No"; then
-            printf "Not replacing existing container.\n"
-            printf "Finished Bluefin-CLI setup, rerun with ujust bluefin-cli to reconfigure\n"
-            printf "Exiting...\n"
-            exit 0
-        elif test "$REBUILD" = "Yes"; then
-            printf "Destroying existing bluefin-cli container\n"
-            /usr/bin/env DBX_CONTAINER_MANAGER="podman" /usr/bin/distrobox-rm -f bluefin-cli
-        fi
-    fi
-    if test "$MANAGEMENT_CHOICE" = "Quadlet"; then
-        /usr/bin/systemctl --user enable --now bluefin-cli.target 
-        /usr/bin/systemctl --user start bluefin-cli.service
-    elif test "$MANAGEMENT_CHOICE" = "Distrobox"; then
-        /usr/bin/env DBX_CONTAINER_MANAGER="podman" /usr/bin/distrobox-create --nvidia Y --image ghcr.io/ublue-os/bluefin-cli:latest -n bluefin-cli --no-entry --pull
-        /usr/bin/env DBX_CONTAINER_MANAGER="podman" /usr/bin/distrobox-enter bluefin-cli -- bash -l -c "exit" 
-    else
-        printf "You have chosen none.\n"
-        printf "Finished Bluefin-CLI setup, rerun with ujust bluefin-cli to reconfigure\n"
-        printf "Exiting...\n"
-        exit 0
-    fi
-    if test "$TERMINAL_CHOICE" = "Container"; then
-        printf "Setting first terminal be Container for bash using ~/.bashrc.d\n"
-        printf "Enter into container using prompt's menu after first entry\n"
-        ln -sf /usr/share/ublue-os/bluefin-cli/bluefin-cli.sh ~/.bashrc.d/zz-container.sh
-    fi 
-    printf "Finished Bluefin-CLI setup, rerun with ujust bluefin-cli to reconfigure\n"
+    /usr/libexec/bluefin-cli.sh
 
 # Enable Cockpit for web-based system management | https://cockpit-project.org/
 cockpit:
diff --git a/usr/lib/systemd/user/bluefin-cli-update.service b/usr/lib/systemd/user/bluefin-cli-update.service
deleted file mode 100644
index 56a087913ea..00000000000
--- a/usr/lib/systemd/user/bluefin-cli-update.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Restart bluefin-cli.service to rebuild container
-
-[Service]
-Type=oneshot
-ExecStart=-/usr/bin/podman pull ghcr.io/ublue-os/bluefin-cli:latest
-ExecStart=-/usr/bin/systemctl --user restart bluefin-cli.service
\ No newline at end of file
diff --git a/usr/lib/systemd/user/bluefin-cli.target b/usr/lib/systemd/user/bluefin-cli.target
deleted file mode 100644
index 709bb37f77a..00000000000
--- a/usr/lib/systemd/user/bluefin-cli.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Bluefin-CLI target for bluefin-cli quadlet
-
-[Install]
-WantedBy=default.target
\ No newline at end of file
diff --git a/usr/libexec/bluefin-cli.sh b/usr/libexec/bluefin-cli.sh
new file mode 100755
index 00000000000..e2f49ede0f3
--- /dev/null
+++ b/usr/libexec/bluefin-cli.sh
@@ -0,0 +1,238 @@
+#!/usr/bin/env bash
+# shellcheck source=/dev/null
+source /usr/lib/ujust/ujust.sh
+
+###
+# List of possible containers
+###
+targets=(
+    "bluefin-cli"
+    "bluefin-dx-cli"
+    "fedora-toolbox"
+    "ubuntu-toolbox"
+    "wolfi-toolbox"
+    "wolfi-dx-toolbox"
+)
+
+###
+# Exit Function
+###
+# shellcheck disable=SC2154
+function Exiting(){
+    echo "${red}Exiting...${normal}"
+    echo "Rerun CLI setup using ${blue}ujust bluefin-cli${normal}..."
+    exit 0
+}
+function Good_Exit(){
+    echo ""
+    echo "Finished Bluefin-CLI setup, rerun with ${blue}ujust bluefin-cli${normal} to reconfigure"
+}
+
+###
+# Exit if string is empty
+###
+function String_check(){
+    if test -z "$1"; then
+        Exiting
+    fi
+}
+
+###
+# Trap function
+###
+function ctrl_c(){
+    printf "\nSignal SIGINT caught\n"
+    Exiting
+}
+
+
+###
+# Choose if you want to use the Host or Container for first terminal
+###
+function Terminal_choice(){
+    TERMINAL_CHOICE=$(Choose Host Container)
+    if test "$TERMINAL_CHOICE" = "Host"; then
+        echo "You have chosen to use Host Terminal."
+    fi
+    String_check "$TERMINAL_CHOICE"
+}
+
+###
+# If Host was chosen, ask if they still want to make a container
+###
+function Make_container(){
+    MAKE_CONTAINER=0
+    if test "$1" = "Host"; then
+        echo "Would you still like to setup default container?"
+        MAKE_CONTAINER=$(Confirm) 
+    fi
+    if test "$MAKE_CONTAINER" -eq 1; then
+        printf "Not making a container. Existing containers will not be deleted...\n"
+        Make_bashrc_d_file "$TERMINAL_CHOICE" "$CONTAINER_CHOICE"
+        Good_Exit
+    fi
+}
+
+###
+# Choose which container they want to use
+# For bluefin-cli and wolfi, ask if they want dx
+###
+function Choose_container(){
+    DX_VERSION=1
+    echo "Which Container Toolbox would you like to use?"
+    CONTAINER_CHOICE=$(Choose "${targets[@]}")
+    if test "$CONTAINER_CHOICE" = "bluefin-cli" || test "$CONTAINER_CHOICE" = "wolfi-toolbox"; then
+        printf "Would you like to use developer toolkit version?\n"
+        printf "It has packages for building Apks and other SDKs.\n"
+        DX_VERSION=$(Confirm)
+        if test "$DX_VERSION" -eq 0; then
+            MATCH=$(echo "$CONTAINER_CHOICE" | cut -d "-" -f 2)
+            CONTAINER_CHOICE="${CONTAINER_CHOICE%%"${MATCH}"*}dx-${MATCH}${CONTAINER_CHOICE##*"${MATCH}"}"
+        fi
+    fi
+    unset "$DX_VERSION"
+    unset "$MATCH"
+    String_check "$CONTAINER_CHOICE"
+}
+
+###
+# Ask how they want to manage the container.
+###
+function Container_manager(){
+    echo "Would you like to use ${blue}quadlets${normal} to manage your container?"
+    echo ""
+    echo "${blue}Quadlets automatically rebuild your container on login.${normal}"
+    echo "They will always be on the latest image you have pulled."
+    echo "However, ${red}manually installed packages using apk, apt, or dnf will not persist${normal}."
+    CONTAINER_MANAGER=$(Choose Quadlet Distrobox)
+    String_check "$CONTAINER_MANAGER"
+}
+
+###
+# Check to see if the chosen container already exists as a quadlet.
+# If it does ask to disable and remove it otherwise quit.
+# Takes chosen container as an argument.
+###
+function Is_enabled_and_stop(){
+    MATCH=0
+    for i in "${targets[@]}"
+    do
+        Enabled=0
+        Enabled=$(systemctl --user is-enabled "$i".target)
+        if test "$Enabled" = "enabled" && test "$i" != "$1"; then
+            echo "$i is enabled."
+            echo "Would you like to disable and stop container?"
+            Disable=$(Confirm) 
+            if test "$Disable" -eq 0; then
+                systemctl --user --now disable "$i".target
+                if test "systemctl --user --quiet is-active $i.service"; then
+                    systemctl --user stop "$i".service
+                fi
+            else
+                printf "Not disabling and stopping existing container %s..." "$i"
+            fi
+            unset "$Disable" 
+        elif test "$Enabled" = "enabled" && test "$i" = "$1"; then
+            echo "$1 is already enabled..."
+            MATCH=1
+        fi
+        unset "$Enabled"
+    done
+    if test "$MATCH" -eq 1; then
+        Make_bashrc_d_file "$TERMINAL_CHOICE" "$1" 
+        Good_Exit
+    fi
+}
+
+###
+# Check to see if the chosen container already exists.
+# If it does ask to remove it otherwise exit.
+# Takes chosen container as an argument.
+###
+function Already_exists_and_rm(){
+    for i in "${targets[@]}" 
+    do
+        Exists=0
+        Exists=$(podman ps --all --filter name="$i" | grep -q " $i\$" && echo "1" || echo "0")
+        if test "$Exists" -eq 1 && test "$i" = "$1"; then
+            echo "$1 ${red}exists${normal}, would you like to ${red}delete it?${normal}"
+            Delete=$(Confirm)
+            if test "$Delete" -eq 0; then
+                echo "Removing $1..."
+                podman rm --force "$1"
+            else
+                printf "Not removing %s and cannot continue since %s already exists..." "$1" "$1"
+                Exiting
+            fi
+            unset "$Delete"
+        elif test "$Exists" -eq 1 && test "$i" != "$1"; then
+            echo "$i exists, would you like to ${red}delete it?${normal}"
+            Delete=$(Confirm)
+            if test "$Delete" -eq 0; then
+                echo "Removing $i..."
+                podman rm --force "$i"
+            else
+                echo "Not removing $i..."
+            fi
+            unset "$Delete"
+        fi
+        unset "$Exists"
+    done
+}
+
+###
+# Build the container. Takes 3 inputs. 1: if you build it. 2: Container Manager. 3: The actual container
+###
+function Build_container(){
+    if test "$1" -eq 1; then
+        printf "Not Building a container..."
+        Exiting
+    fi
+    if test "$2" = "Quadlet"; then
+        echo "${blue}Building container using a Quadlet${normal}"
+        echo ""
+        systemctl --user enable "$3".target
+        systemctl --user restart "$3".service
+    elif test "$2" = "Distrobox"; then
+        echo "${blue}Building container using a Distrobox${normal}"
+        echo ""
+        distrobox-create --nvidia --no-entry -Y --image "ghcr.io/ublue-os/${3}" --name "$3"
+    else
+        printf "Unkown Choice..."
+        Exiting
+    fi
+}
+
+###
+# If ~/.bashrc.d exists and Chose Container for terminal. Make a symlink from /usr/share/ublue-os for first time shell.
+# If Host was chosen. Remove existing symlink.
+###
+function Make_bashrc_d_file(){
+    if test -d "${HOME}/.bashrc.d" && test "$1" = "Host"; then
+            echo "${red}Removing existing ~/.bashrc.d/00-container.sh if it exists${normal}."
+            test -f "${HOME}/.bashrc.d/00-container.sh" && rm "${HOME}/.bashrc.d/00-container.sh"
+    elif test -d "${HOME}/.bashrc.d"; then
+        echo "Setting first terminal be Container for bash using ~/.bashrc.d"
+        echo "Enter into container using prompt's menu after first entry"
+        echo "${blue}This requires your bash shell to source files in ~/.bashrc.d/${normal}"
+        cp "/usr/share/ublue-os/bluefin-cli/${2}.sh" "${HOME}/.bashrc.d/00-container.sh"
+    else
+        echo "${red}Not implemented for non-Bash shells${normal} at this time..."
+    fi
+}
+
+function main(){
+    trap ctrl_c SIGINT
+    printf "Set Up bluefin-cli\n"
+    Terminal_choice
+    Make_container "$TERMINAL_CHOICE" 
+    Container_manager
+    Choose_container
+    Is_enabled_and_stop "$CONTAINER_CHOICE"
+    Already_exists_and_rm "$CONTAINER_CHOICE" 
+    Build_container "$MAKE_CONTAINER" "$CONTAINER_MANAGER" "$CONTAINER_CHOICE"
+    Make_bashrc_d_file "$TERMINAL_CHOICE" "$CONTAINER_CHOICE"
+    Good_Exit
+}
+
+main
\ No newline at end of file