diff --git a/packages.json b/packages.json
index f900b40ec50..c22c465bcce 100644
--- a/packages.json
+++ b/packages.json
@@ -59,6 +59,7 @@
 				"tmux",
 				"ublue-motd",
 				"usbmuxd",
+				"ublue-brew",
 				"ublue-bling",
 				"wireguard-tools",
 				"xprop",
diff --git a/system_files/shared/etc/profile.d/brew-bash-completion.sh b/system_files/shared/etc/profile.d/brew-bash-completion.sh
deleted file mode 100644
index 424ac4ad1bc..00000000000
--- a/system_files/shared/etc/profile.d/brew-bash-completion.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# shellcheck shell=sh disable=SC1091,SC2039,SC2166
-# Check for interactive bash and that we haven't already been sourced.
-if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BREW_BASH_COMPLETION-}" = x ]; then
-
-    # Check for recent enough version of bash.
-    if [ "${BASH_VERSINFO[0]}" -gt 4 ] ||
-        [ "${BASH_VERSINFO[0]}" -eq 4 -a "${BASH_VERSINFO[1]}" -ge 2 ]; then
-        if [ -w /home/linuxbrew/.linuxbrew ]; then
-            if ! test -L /home/linuxbrew/.linuxbrew/etc/bash_completion.d/brew; then
-                /home/linuxbrew/.linuxbrew/bin/brew completions link > /dev/null
-            fi
-        fi
-        if test -d /home/linuxbrew/.linuxbrew/etc/bash_completion.d; then
-            for rc in /home/linuxbrew/.linuxbrew/etc/bash_completion.d/*; do
-                if test -r "$rc"; then
-                . "$rc"
-                fi
-            done
-            unset rc
-        fi
-    fi
-    BREW_BASH_COMPLETION=1
-    export BREW_BASH_COMPLETION
-fi
diff --git a/system_files/shared/etc/security/limits.d/30-brew-limits.conf b/system_files/shared/etc/security/limits.d/30-brew-limits.conf
deleted file mode 100644
index 45d18f45758..00000000000
--- a/system_files/shared/etc/security/limits.d/30-brew-limits.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#This file sets the resource limits for the users logged in via PAM,
-#more specifically, users logged in on via SSH or tty (console).
-#Limits related to terminals in Wayland/Xorg sessions depend on a
-#change to /etc/systemd/user.conf.
-#This does not affect resource limits of the system services.
-#This file overrides defaults set in /etc/security/limits.conf
-
-* soft nofile 4096
-root soft nofile 4096
diff --git a/system_files/shared/usr/lib/systemd/system-preset/01-homebrew.preset b/system_files/shared/usr/lib/systemd/system-preset/02-homebrew-update.preset
similarity index 66%
rename from system_files/shared/usr/lib/systemd/system-preset/01-homebrew.preset
rename to system_files/shared/usr/lib/systemd/system-preset/02-homebrew-update.preset
index 0d29503e589..ff7342b8406 100644
--- a/system_files/shared/usr/lib/systemd/system-preset/01-homebrew.preset
+++ b/system_files/shared/usr/lib/systemd/system-preset/02-homebrew-update.preset
@@ -1,3 +1,2 @@
-enable brew-setup.service
 enable brew-update.timer
 enable brew-upgrade.timer
diff --git a/system_files/shared/usr/lib/systemd/system/brew-setup.service b/system_files/shared/usr/lib/systemd/system/brew-setup.service
deleted file mode 100644
index 98fa5d65048..00000000000
--- a/system_files/shared/usr/lib/systemd/system/brew-setup.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Setup Brew
-Wants=network-online.target
-After=network-online.target
-ConditionPathExists=!/etc/.linuxbrew
-ConditionPathExists=!/var/home/linuxbrew/.linuxbrew
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/mkdir -p /tmp/homebrew
-ExecStart=/usr/bin/tar --zstd -xvf /usr/share/homebrew.tar.zst -C /tmp/homebrew
-ExecStart=/usr/bin/cp -R -n /tmp/homebrew/home/linuxbrew/.linuxbrew /var/home/linuxbrew
-ExecStart=/usr/bin/chown -R 1000:1000 /var/home/linuxbrew
-ExecStart=/usr/bin/rm -rf /tmp/homebrew
-ExecStart=/usr/bin/touch /etc/.linuxbrew
-
-[Install]
-WantedBy=default.target multi-user.target
diff --git a/system_files/shared/usr/lib/tmpfiles.d/homebrew.conf b/system_files/shared/usr/lib/tmpfiles.d/homebrew.conf
deleted file mode 100644
index 92cd2fd8a66..00000000000
--- a/system_files/shared/usr/lib/tmpfiles.d/homebrew.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-d /var/lib/homebrew 0755 1000 1000 - -
-d /var/cache/homebrew 0755 1000 1000 - -
-d /var/home/linuxbrew 0755 1000 1000 - -
diff --git a/system_files/shared/usr/share/fish/vendor_conf.d/brew.fish b/system_files/shared/usr/share/fish/vendor_conf.d/brew.fish
deleted file mode 100644
index bb6d10d8889..00000000000
--- a/system_files/shared/usr/share/fish/vendor_conf.d/brew.fish
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/fish
-#shellcheck disable=all
-if status --is-interactive
-    if [ -d /home/linuxbrew/.linuxbrew ]
-        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-        if test -d (brew --prefix)/share/fish/completions
-            set -p fish_complete_path (brew --prefix)/share/fish/completions
-        end
-        if test -d (brew --prefix)/share/fish/vendor_completions.d
-            set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
-        end
-    end
-end