diff --git a/brew/bin/setup.sh b/brew/bin/setup.sh
index 3b5c1d08..0100564f 100755
--- a/brew/bin/setup.sh
+++ b/brew/bin/setup.sh
@@ -1,22 +1,3 @@
 #!/bin/bash
 
-case `uname -s` in
-Darwin*)
-  if [ `uname -m` = "arm64" ]; then
-    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  else
-    sudo mkdir /opt/homebrew-x86_64
-    sudo chown `whoami`:staff /opt/homebrew-x86_64
-    curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C /opt/homebrew-x86_64
-  fi
-  ;;
-Linux*)
-  HOMEBREW_INSTALL_DIR=$HOME/.linuxbrew
-  echo "Start custom installation to $HOMEBREW_INSTALL_DIR"
-  mkdir -p $HOMEBREW_INSTALL_DIR
-  pushd $HOMEBREW_INSTALL_DIR
-  curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip-components 1 -C $HOMEBREW_INSTALL_DIR
-  popd
-  ;;
-esac
-
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
diff --git a/zsh/config.d/zshrc b/zsh/config.d/zshrc
index ea6b418a..528e6f00 100644
--- a/zsh/config.d/zshrc
+++ b/zsh/config.d/zshrc
@@ -70,17 +70,11 @@ done
 
 case `uname -s` in
 Darwin*)
-  if [ `uname -m` = "arm64" ]; then
-    export HOMEBREW_ROOT=/opt/homebrew
-    export HOMEBREW_CACHE=$HOME/.cache/Homebrew
-  else
-    export HOMEBREW_ROOT=/opt/homebrew-x86_64
-    export HOMEBREW_CACHE=$HOME/.cache/Homebrew-x86_64
-  fi
+  export HOMEBREW_ROOT=/opt/homebrew
+  export HOMEBREW_CACHE=$HOME/.cache/Homebrew
   ;;
 Linux*)
-  eval `ssh-agent -s`
-  export HOMEBREW_ROOT=$HOME/.linuxbrew
+  export HOMEBREW_ROOT=/home/linuxbrew/.linuxbrew
   ;;
 esac