diff --git a/home/dot_zshrc.tmpl b/home/dot_zshrc.tmpl
index a1c3064..9aa61c8 100644
--- a/home/dot_zshrc.tmpl
+++ b/home/dot_zshrc.tmpl
@@ -35,6 +35,8 @@ plugins=(
 {{- if eq .chezmoi.os "darwin" }}
   macos
   brew
+{{- else if eq .chezmoi.os "linux" }}
+  brew
 {{- end }}
 )
 
@@ -103,7 +105,3 @@ fi
 unset __conda_setup
 # <<< conda initialize <<<
 {{ end }}
-
-{{ if eq .chezmoi.os "linux" }}
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-{{ end }}
diff --git a/home/run_onchange_01_install-packages.sh.tmpl b/home/run_onchange_01_install-packages.sh.tmpl
index 3400ade..6b52c2c 100644
--- a/home/run_onchange_01_install-packages.sh.tmpl
+++ b/home/run_onchange_01_install-packages.sh.tmpl
@@ -76,8 +76,6 @@ sudo apt install -y zsh direnv byobu python3 python-is-python3 virtualenv sshpas
 log::always "Installing Charmbracelet packages"
 {{- if lt .osversion "24.04" }}
 log::always "Installing Golang from homebrew as Ubunut 22.04 does not have Golang 20 or greater"
-# ensure homebrew binaries are first in path to use the new Golang for installs
-export PATH="/home/linuxbrew/.linuxbrew/bin/:$PATH"
 # fallback to homebrew on Ubuntu 22.04 as Golang is stuck at v18
 brew install go
 {{ end }}
diff --git a/scripts/install_tools.sh b/scripts/install_tools.sh
index eb78168..5fd60d4 100644
--- a/scripts/install_tools.sh
+++ b/scripts/install_tools.sh
@@ -46,6 +46,7 @@ elif [[ "$(util::host_os)" == "linux"* ]]; then
         ansi --green "Homebrew not installed. Installing..."
         bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
         /home/linuxbrew/.linuxbrew/bin/brew analytics off
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
     fi
 
      if util::is_available chezmoi; then