diff --git a/build_files/base/06-fetch-quadlets.sh b/build_files/base/06-fetch-quadlets.sh
index 57eef59dfc4..f0c57b3db0e 100755
--- a/build_files/base/06-fetch-quadlets.sh
+++ b/build_files/base/06-fetch-quadlets.sh
@@ -5,14 +5,6 @@ set -ouex pipefail
 # Make Directory
 mkdir -p /etc/containers/systemd/users
 
-# bluefin-cli
-curl -Lo /etc/containers/systemd/users/bluefin-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container
-sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /etc/containers/systemd/users/bluefin-cli.container
-
-# bluefin-dx-cli
-curl -Lo /etc/containers/systemd/users/bluefin-dx-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-dx-cli.container
-sed -i 's/ContainerName=bluefin/ContainerName=bluefin-dx-cli/' /etc/containers/systemd/users/bluefin-dx-cli.container
-
 # fedora-toolbox
 curl -Lo /etc/containers/systemd/users/fedora-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
 sed -i 's/ContainerName=fedora-distrobox-quadlet/ContainerName=fedora-toolbox/' /etc/containers/systemd/users/fedora-toolbox.container
@@ -36,8 +28,6 @@ printf "\nVolume=/home/linuxbrew:/home/linuxbrew:rslave\nVolume=/etc/profile.d/b
 # Make systemd targets
 mkdir -p /usr/lib/systemd/user
 QUADLET_TARGETS=(
-    "bluefin-cli"
-    "bluefin-dx-cli"
     "fedora-toolbox"
     "ubuntu-toolbox"
     "wolfi-toolbox"
diff --git a/just/bluefin-system.just b/just/bluefin-system.just
index b7d633d5c91..215361633a9 100644
--- a/just/bluefin-system.just
+++ b/just/bluefin-system.just
@@ -19,11 +19,6 @@ benchmark:
 bluefin-cli:
     @/usr/libexec/ublue-bling.sh
 
-# Configure Bluefin-CLI Terminal Experience
-[private]
-bluefin-cli-container:
-    @/usr/libexec/enable-bluefin-cli.sh
-
 # Configure Terminal Experience
 [private]
 configure-terminal:
diff --git a/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop b/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop
deleted file mode 100644
index ab247d34717..00000000000
--- a/system_files/kinoite/usr/share/applications/quadlet-bluefin.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/libexec/distrobox-quadlet-ptyxis.sh bluefin-cli
-Name=Bluefin-CLI
-NoDisplay=true
-StartupNotification=false
-Type=Application
-X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Meta+Return
diff --git a/system_files/kinoite/usr/share/kglobalaccel/quadlet-bluefin.desktop b/system_files/kinoite/usr/share/kglobalaccel/quadlet-bluefin.desktop
deleted file mode 100644
index ab247d34717..00000000000
--- a/system_files/kinoite/usr/share/kglobalaccel/quadlet-bluefin.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/libexec/distrobox-quadlet-ptyxis.sh bluefin-cli
-Name=Bluefin-CLI
-NoDisplay=true
-StartupNotification=false
-Type=Application
-X-KDE-GlobalAccel-CommandShortcut=true
-X-KDE-Shortcuts=Meta+Return
diff --git a/system_files/shared/usr/libexec/configure-terminal.sh b/system_files/shared/usr/libexec/configure-terminal.sh
index 0609124c2d6..82a129bca0b 100755
--- a/system_files/shared/usr/libexec/configure-terminal.sh
+++ b/system_files/shared/usr/libexec/configure-terminal.sh
@@ -6,8 +6,6 @@ source /usr/lib/ujust/ujust.sh
 # List of possible containers
 ###
 targets=(
-    "bluefin-cli"
-    "bluefin-dx-cli"
     "fedora-toolbox"
     "ubuntu-toolbox"
     "wolfi-toolbox"
@@ -20,7 +18,7 @@ targets=(
 # shellcheck disable=SC2154
 function Exiting(){
     echo "${red}Exiting...${normal}"
-    echo "Rerun CLI setup using ${blue}ujust bluefin-cli${normal}..."
+    echo "Rerun setup using ${blue}ujust configure-terminal${normal}..."
     exit 0
 }
 function Good_Exit(){
@@ -211,7 +209,7 @@ function Build_container(){
 
 function main(){
     trap ctrl_c SIGINT
-    printf "Set Up bluefin-cli\n"
+    printf "Set up containers\n"
     Terminal_choice
     Make_container "$TERMINAL_CHOICE" 
     Container_manager
diff --git a/system_files/shared/usr/libexec/enable-bluefin-cli.sh b/system_files/shared/usr/libexec/enable-bluefin-cli.sh
deleted file mode 100755
index 334f67ddb84..00000000000
--- a/system_files/shared/usr/libexec/enable-bluefin-cli.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/bash
-
-# Choose to enable or disable bluefin-cli
-
-# shellcheck disable=1091
-# shellcheck disable=2206
-# shellcheck disable=2154
-source /usr/lib/ujust/ujust.sh
-
-bluefin_cli=(${red}Disabled${n} ${red}Inactive${n} ${red}Not Default${n})
-
-function get_status(){
-    if systemctl --quiet --user is-enabled bluefin-cli.target; then
-        bluefin_cli[0]="${green}Enabled${n}"
-    else
-        bluefin_cli[0]="${red}Disabled${n}"
-    fi
-    if systemctl --quiet --user is-active bluefin-cli.service; then
-        bluefin_cli[1]="${green}Active${n}"
-    else
-        bluefin_cli[1]="${red}Inactive${n}"
-    fi
-    get_default=$(dconf read /org/gnome/Ptyxis/default-profile-uuid)
-    if test "$get_default" = "'a21a910811504857bea4c96b3d937b93'"; then
-        bluefin_cli[2]="${green}Default${n}"
-    else
-        bluefin_cli[2]="${red}Not-Default${n}"
-    fi
-    echo "Bluefin-cli is currently ${b}${bluefin_cli[0]}${n} (run status), ${b}${bluefin_cli[1]}${n} (on boot status), and ${b}${bluefin_cli[2]}${n} (terminal profile)."
-}
-
-function default_login(){
-    toggle=$(Choose Default Not-Default Cancel)
-    if test "$toggle" = "Default"; then
-        echo "Setting Bluefin-CLI to default Ptyxis Profile"
-        /usr/libexec/ptyxis-create-profile.sh bluefin-cli default
-    elif test "$toggle" = "Not-Default"; then
-        echo "Setting Host back to default Ptyxis Profile"
-        /usr/libexec/ptyxis-create-profile.sh Host default
-    else
-        dconf write /or
-        echo "Not Changing"
-    fi
-}
-
-function logic(){
-    if test "$toggle" = "Enable"; then
-        echo "${b}${green}Enabling${n} Bluefin-CLI"
-        systemctl --user enable --now bluefin-cli.target > /dev/null 2>&1 
-        if ! systemctl --quiet --user is-active bluefin-cli.service; then
-            systemctl --user reset-failed bluefin-cli.service > /dev/null 2>&1 || true
-            echo "${b}${green}Starting${n} Bluefin-CLI"
-            systemctl --user start bluefin-cli.service
-        fi
-        default_login
-    elif test "$toggle" = "Disable"; then
-        echo "${b}${red}Disabling${n} Bluefin-CLI"
-        systemctl --user disable --now bluefin-cli.target > /dev/null 2>&1
-        if systemctl --quiet --user is-active bluefin-cli.service; then
-            echo "Do you want to ${b}${red}Stop${n} the Container?"
-            stop=$(Confirm)
-            if test "$stop" -eq 0; then
-                systemctl --user stop bluefin-cli.service > /dev/null 2>&1
-                systemctl --user reset-failed bluefin-cli.service > /dev/null 2>&1 || true
-            fi
-        fi
-        echo "Setting Host back to default Ptyxis Profile"
-        /usr/libexec/ptyxis-create-profile.sh Host default
-    else
-        echo "Not Changing"
-    fi
-}
-
-function main(){
-    get_status
-    toggle=$(Choose Enable Disable Cancel)
-    logic
-    get_status
-}
-
-main
diff --git a/system_files/shared/usr/libexec/ptyxis-create-profile.sh b/system_files/shared/usr/libexec/ptyxis-create-profile.sh
index 188aa778da5..bc7173247db 100755
--- a/system_files/shared/usr/libexec/ptyxis-create-profile.sh
+++ b/system_files/shared/usr/libexec/ptyxis-create-profile.sh
@@ -79,8 +79,6 @@ fi
 
 if test -n "$palette"; then
 	dconf write "${profile}palette" "'${palette}'"
-elif test "$name" = "bluefin-cli" || test "$name" = "bluefin-dx-cli"; then
-	dconf write "${profile}palette" "'catppuccin-dynamic'"
 elif test "$name" = "fedora-toolbox"; then
 	dconf write "${profile}palette" "'Elio'"
 elif test "$name" = "ubuntu-toolbox"; then
diff --git a/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers b/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers
index fbb053d5b54..8ed90a7d38f 100644
--- a/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers
+++ b/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers
@@ -1,7 +1,5 @@
 # shellcheck shell=bash
 declare -Ar known_container=(
-    ["bluefin-cli"]="a21a910811504857bea4c96b3d937b93"
-    ["bluefin-dx-cli"]="276d25e6065b497b96dd57e4f95ff50a"
     ["fedora-toolbox"]="d6fe45489ed74fada5d95d715449ce7e"
     ["ubuntu-toolbox"]="4741cb2eb3614750b79edc5c4b8c08b3"
     ["wolfi-toolbox"]="33bd8e9953224e6985d8524e9b7294a1"
@@ -9,8 +7,6 @@ declare -Ar known_container=(
     ["Host"]="2871e8027773ae74d6c87a5f659bbc74"
 )
 declare -Ar known_guid=(
-    ["a21a910811504857bea4c96b3d937b93"]="bluefin-cli"
-    ["276d25e6065b497b96dd57e4f95ff50a"]="bluefin-dx-cli"
     ["d6fe45489ed74fada5d95d715449ce7e"]="fedora-toolbox"
     ["4741cb2eb3614750b79edc5c4b8c08b3"]="ubuntu-toolbox"
     ["33bd8e9953224e6985d8524e9b7294a1"]="wolfi-toolbox"