diff --git a/Brewfile b/Brewfile
index 3c716ba..57c95ef 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,7 +1,3 @@
-# Homebrew stuff
-tap "rcmdnk/file"
-brew "brew-file"
-
 # Fonts
 cask "font-jetbrains-mono-nerd-font"
 cask "font-iosevka-term-nerd-font"
@@ -29,17 +25,15 @@ cask "gimp"
 brew "tmux"
 brew "neovim"
 brew "mise"
-brew "ansible"
 brew "qemu"
 brew "docker"
-tap "int128/kubelogin"
-brew "int128/kubelogin/kubelogin"
-tap "hashicorp/tap"
-brew "hashicorp/tap/vault"
+brew "pi-coding-agent"
+cask "claude-code"
 
 # Tools
 brew "zsh"
 brew "starship"
+brew "just"
 brew "vim"
 brew "gnupg"
 brew "sops"
@@ -76,6 +70,8 @@ brew "ffmpeg"
 brew "oath-toolkit"
 brew "openconnect"
 brew "openvpn"
+tap "int128/kubelogin"
+brew "int128/kubelogin/kubelogin"
 
 # TUIs
 brew "btop"
@@ -99,5 +95,3 @@ brew "mas"
 # Libs
 brew "yubikey-personalization"
 brew "libssh2"
-tap "filosottile/musl-cross"
-brew "filosottile/musl-cross/musl-cross"
diff --git a/Makefile b/Makefile
index f2b7886..59ae6e1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,4 @@ ansible:
 
 .PHONY: brew
 brew:
-	brew bundle --cleanup --zap --force-cleanup
+	brew bundle --zap --force-cleanup
diff --git a/mise/config.toml b/mise/config.toml
index 67759b2..d5e3428 100644
--- a/mise/config.toml
+++ b/mise/config.toml
@@ -8,5 +8,3 @@ python = "latest"
 rust = "latest"
 kubectl = "latest"
 helm = "latest"
-"npm:@earendil-works/pi-coding-agent" = "latest"
-claude-code = "latest"