diff --git a/chezmoi/.chezmoiexternal.toml.tmpl b/chezmoi/.chezmoiexternal.toml.tmpl
index a5d97f31..2b692c25 100644
--- a/chezmoi/.chezmoiexternal.toml.tmpl
+++ b/chezmoi/.chezmoiexternal.toml.tmpl
@@ -5,16 +5,6 @@
   executable = true
   refreshPeriod = "168h"
 
-[".local/bin/mcp-cli"]
-  type = "file"
-{{- if (eq .chezmoi.arch "amd64") }}
-  url = "{{ gitHubLatestReleaseAssetURL "philschmid/mcp-cli" (printf "mcp-cli-%s-%s" .chezmoi.os "x64") }}"
-{{- else }}
-  url = "{{ gitHubLatestReleaseAssetURL "philschmid/mcp-cli" (printf "mcp-cli-%s-%s" .chezmoi.os .chezmoi.arch) }}"
-{{- end }}
-  executable = true
-  refreshPeriod = "168h"
-
 {{- if .is_ephemeral }}
 [".local/bin/fzf"]
   type = "archive-file"
diff --git a/chezmoi/.chezmoiscripts/run_before_brew_install.sh.tmpl b/chezmoi/.chezmoiscripts/run_before_brew_install.sh.tmpl
index 348a6db7..cb09ba0c 100644
--- a/chezmoi/.chezmoiscripts/run_before_brew_install.sh.tmpl
+++ b/chezmoi/.chezmoiscripts/run_before_brew_install.sh.tmpl
@@ -26,6 +26,7 @@ brew bundle install \
 ###
 
 tap "atlassian/acli", trusted: true
+tap "can1357/tap", trusted: true
 tap "databricks/tap", trusted: true
 tap "hashicorp/tap", trusted: true
 tap "oven-sh/bun", trusted: true
@@ -120,6 +121,7 @@ brew "docker-credential-helper"
 brew "kubernetes-cli"
 
 brew "ctx7"
+brew "can1357/tap/omp"
 brew "opencode"
 brew "rtk"
 uv "memsearch"
diff --git a/chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl b/chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl
index 7ab6eae9..c8eec717 100644
--- a/chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl
+++ b/chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl
@@ -31,8 +31,7 @@ fi
 repo_skills=(
   mattpocock/skills=wayfinder,grill-with-docs,to-spec,to-tickets,triage,handoff,implement
   mattpocock/skills=grilling,domain-modeling,research,prototype,codebase-design,tdd,diagnosing-bugs
-  mattpocock/skills=setup-matt-pocock-skills,improve-codebase-architecture,writing-great-skills
-  philschmid/mcp-cli=mcp-cli
+  mattpocock/skills=setup-matt-pocock-skills,improve-codebase-architecture,writing-for-agents
 )
 for entry in "${repo_skills[@]}"; do
   repo="${entry%%=*}"