diff --git a/Makefile b/Makefile
index b751c80..0fe654c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,14 +27,14 @@ link_mac:
 	ln -s ~/Git/dotfiles/macos/.hushlogin ~
 
 mac_setup:
+	xcode-select --install
 	./macos/macos_setup.sh
 
 brew:
 	./macos/install_brew.sh
-	sudo chsh -s /usr/local/bin/bash
-
-cask:
+	brew bundle --file ./macos/Brewfile
 	brew bundle --file ./macos/Caskfile
+	sudo chsh -s /opt/homebrew/bin/zsh
 
 cask_personal:
 	brew bundle --file ./macos/Caskfile.personal
diff --git a/macos/Caskfile b/macos/Caskfile
index 1510063..204e1e4 100644
--- a/macos/Caskfile
+++ b/macos/Caskfile
@@ -12,7 +12,7 @@ cask 'datweatherdoe'
 cask 'figma'
 cask 'firefox'
 cask 'font-caskaydia-cove-nerd-font'
-cask 'forklift'
+# cask 'forklift' # -- use older version
 cask 'gifox'
 cask 'google-chrome'
 cask 'iterm2'
diff --git a/macos/install_brew.sh b/macos/install_brew.sh
index 7b864e1..b86943f 100755
--- a/macos/install_brew.sh
+++ b/macos/install_brew.sh
@@ -5,11 +5,8 @@ if test ! $(which brew); then
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
   echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.bash_profile.local
+  echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $ZDOTDIR/.zshrc.local
   eval "$(/opt/homebrew/bin/brew shellenv)"
 fi
 
 brew update
-
-brew tap homebrew/bundle
-
-brew bundle --file ./macos/Brewfile