diff --git a/.gitmodules b/.gitmodules
index 7f4a894..c9ba367 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,9 @@
 [submodule "subprojects/arch-bootc-pkgs"]
 	path = subprojects/arch-bootc-pkgs
 	url = https://github.com/hecknt/arch-bootc-pkgs
-[submodule "subprojects/ublue-brew"]
-	path = subprojects/ublue-brew
-	url = https://github.com/ublue-os/brew
 [submodule "subprojects/xdg-terminal-exec-nautilus"]
 	path = subprojects/xdg-terminal-exec-nautilus
 	url = https://github.com/zirconium-dev/xdg-terminal-exec-nautilus.git
+[submodule "subprojects/homebrew-arch"]
+	path = subprojects/homebrew-arch
+	url = https://github.com/Lumaeris/homebrew-arch
diff --git a/mkosi.conf.d/subprojects.conf b/mkosi.conf.d/subprojects.conf
index aaf9c3f..0562141 100644
--- a/mkosi.conf.d/subprojects.conf
+++ b/mkosi.conf.d/subprojects.conf
@@ -2,5 +2,12 @@
 Distribution=arch
 
 [Content]
-ExtraTrees=subprojects/ublue-brew/system_files/:/
-            subprojects/assets/system_files/:/
\ No newline at end of file
+ExtraTrees=subprojects/assets/system_files/:/
+Packages=
+		homebrew
+		brew-proxy
+
+[Build]
+SandboxTrees=subprojects/homebrew-arch/repo.gpg:/usr/share/pacman/keyrings/lumaeris.gpg
+			repos/lumaeris-trusted:/usr/share/pacman/keyrings/lumaeris-trusted
+			repos/homebrew.conf:/etc/pacman.d/homebrew.conf
diff --git a/mkosi.postinst.d/os-info.chroot b/mkosi.postinst.d/os-info.chroot
index fb14734..9d2a338 100755
--- a/mkosi.postinst.d/os-info.chroot
+++ b/mkosi.postinst.d/os-info.chroot
@@ -2,8 +2,6 @@
 
 set -uexo pipefail
 
-echo "source /etc/profile.d/brew.sh" | tee -a /etc/bash.bashrc
-
 # Branding variables
 IMAGE_PRETTY_NAME="Apollo"
 HOSTNAME="apollo"
diff --git a/mkosi.prepare.d/install-software.chroot b/mkosi.prepare.d/install-software.chroot
index 4251169..7b28767 100755
--- a/mkosi.prepare.d/install-software.chroot
+++ b/mkosi.prepare.d/install-software.chroot
@@ -7,8 +7,3 @@ cd /tmp
 git clone "https://gitlab.freedesktop.org/Vladimir-csp/xdg-terminal-exec.git" && cd xdg-terminal-exec
 
 make prefix="/usr" install
-
-# Install the homebrew.tar.zst
-mkdir /tmp/brew
-crane export ghcr.io/ublue-os/brew:latest | tar --strip-components=2 -xvf - -C /tmp/brew system_files/usr/share/homebrew.tar.zst
-mv /tmp/brew/share/homebrew.tar.zst /usr/share/homebrew.tar.zst
diff --git a/repos/homebrew.conf b/repos/homebrew.conf
new file mode 100644
index 0000000..4136f8e
--- /dev/null
+++ b/repos/homebrew.conf
@@ -0,0 +1,3 @@
+[homebrew]
+SigLevel = Required
+Server = https://github.com/Lumaeris/homebrew-arch/releases/download/$repo
diff --git a/repos/lumaeris-trusted b/repos/lumaeris-trusted
new file mode 100644
index 0000000..5c60ef3
--- /dev/null
+++ b/repos/lumaeris-trusted
@@ -0,0 +1 @@
+F88AD54AC93B084021C2BB69FC179FA0288C0734:4:
diff --git a/subprojects/homebrew-arch b/subprojects/homebrew-arch
new file mode 160000
index 0000000..d4b839c
--- /dev/null
+++ b/subprojects/homebrew-arch
@@ -0,0 +1 @@
+Subproject commit d4b839cd07afa00308007fae9c4c7aba47dcaace
diff --git a/subprojects/ublue-brew b/subprojects/ublue-brew
deleted file mode 160000
index 55f0e75..0000000
--- a/subprojects/ublue-brew
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55f0e7542856b6e2e8703212b3e5d5d02f9b864f