diff --git a/config/bash/shell b/config/bash/shell
index 98bf31c..2b6562c 100644
--- a/config/bash/shell
+++ b/config/bash/shell
@@ -47,8 +47,9 @@ export DOTNETPATH="$HOME/.dotnet/tools"
 # Podman
 # export DOCKER_HOST=unix:///run/user/1000/podman/podman.sock
 
-# Set complete path
-export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PANAMA_PATH/bin:$BUN_INSTALL/bin:$CARGO_PATH/bin:$PNPM_HOME/bin:$PYENV_ROOT/bin:$HOME/.rbenv/bin:/usr/lib/ccache/bin/:$GOPATH/bin:$DOTNETPATH"
+# Set complete path. ~/.opencode/bin is OpenCode 2's own installer location
+# and sits ahead of Bun's bin, which can still hold an OpenCode 1 copy.
+export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PANAMA_PATH/bin:$HOME/.opencode/bin:$BUN_INSTALL/bin:$CARGO_PATH/bin:$PNPM_HOME/bin:$PYENV_ROOT/bin:$HOME/.rbenv/bin:/usr/lib/ccache/bin/:$GOPATH/bin:$DOTNETPATH"
 
 # rustup writes this file, and initial-packages installs rustup rather than
 # running rustup-init -- so on a fresh machine it does not exist yet and an
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index d693424..94687e4 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -9,7 +9,8 @@ export EDITOR="nvim"
 export SUDO_EDITOR="$EDITOR"
 
 export BUN_INSTALL="$HOME/.bun"
-export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PANAMA_PATH/bin:$PATH"
+# ~/.opencode/bin is OpenCode 2's own installer location, ahead of Bun's bin.
+export PATH="$HOME/.local/bin:$HOME/.opencode/bin:$BUN_INSTALL/bin:$PANAMA_PATH/bin:$PATH"
 
 # History shared across sessions, so tmux panes see each other's commands.
 HISTFILE="$HOME/.zsh_history"