diff --git a/README.md b/README.md
index 9d5190d..f8ee8bd 100644
--- a/README.md
+++ b/README.md
@@ -35,26 +35,6 @@ On first boot, `brew-setup.service` will automatically:
 2. Set up proper permissions
 3. Make Homebrew ready to use
 
-### Advanced Example with Pre-installed Packages
-
-If you want to pre-install Homebrew packages in your image:
-
-```dockerfile
-# Copy Homebrew files
-COPY --from=ghcr.io/ublue-os/brew:latest /system_files /
-
-# Install Homebrew packages during image build
-RUN mkdir -p /var/home/linuxbrew && \
-    tar --zstd -xvf /usr/share/homebrew.tar.zst -C /tmp && \
-    mv /tmp/home/linuxbrew/.linuxbrew /var/home/linuxbrew/ && \
-    eval "$(/var/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && \
-    brew install gcc neovim ripgrep && \
-    brew cleanup && \
-    tar --zstd -cvf /usr/share/homebrew.tar.zst /var/home/linuxbrew/.linuxbrew && \
-    rm -rf /var/home/linuxbrew/.linuxbrew /tmp/home
-```
-
-
 ## Systemd Services
 
 ### `brew-setup.service`
diff --git a/system_files/etc/profile.d/brew.sh b/system_files/etc/profile.d/brew.sh
index f55f63c..b485ca1 100755
--- a/system_files/etc/profile.d/brew.sh
+++ b/system_files/etc/profile.d/brew.sh
@@ -3,13 +3,7 @@
 # Prioritize system binaries to prevent brew overriding things like dbus
 # See: https://github.com/ublue-os/brew/blob/54b30cc07d3211fca65ca5cc724e9812c8c79b77/system_files/usr/lib/systemd/system/brew-upgrade.service#L17-L22
 if [[ -d /home/linuxbrew/.linuxbrew && $- == *i* ]] ; then
-  export HOMEBREW_PREFIX="/home/linuxbrew/.linuxbrew"
-  export HOMEBREW_CELLAR="/home/linuxbrew/.linuxbrew/Cellar"
-  export HOMEBREW_REPOSITORY="/home/linuxbrew/.linuxbrew/Homebrew"
-  [ -z "${MANPATH-}" ] || export MANPATH="${MANPATH#:}:"
-  export INFOPATH="${INFOPATH}:/home/linuxbrew/.linuxbrew/share/info"
-  export PATH="${PATH}:/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin"
-  if [ "$(basename $(readlink /proc/$$/exe))" == "zsh" ] ; then
-    fpath[1,0]="/home/linuxbrew/.linuxbrew/share/zsh/site-functions"
-  fi
+  eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv | grep -Ev '\bPATH=')"
+  HOMEBREW_PREFIX="${HOMEBREW_PREFIX:-/home/linuxbrew/.linuxbrew}"
+  export PATH="${PATH}:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin"
 fi