diff --git a/Brewfile-core b/Brewfile-core
index 0c301ad..dd03e11 100644
--- a/Brewfile-core
+++ b/Brewfile-core
@@ -17,7 +17,6 @@ brew 'kubernetes-cli'
 
 # CloudFoundry binaries
 brew 'bbr'
-brew 'cloudfoundry/tap/cf-cli@7', link: true, overwrite: true
 brew 'cloudfoundry/tap/bbl'
 brew 'cloudfoundry/tap/bosh-cli'
 brew 'cloudfoundry/tap/credhub-cli'
diff --git a/lib/environment-variables.bash b/lib/environment-variables.bash
index ab23bc9..9b3ca40 100644
--- a/lib/environment-variables.bash
+++ b/lib/environment-variables.bash
@@ -11,6 +11,9 @@ export PATH=$PATH:$GOPATH/bin
 # Add capi-workspace/scripts to PATH
 export PATH="$PATH:$HOME/workspace/capi-workspace/bin"
 
+
+# Add CLI out directory to PATH
+export PATH="$PATH:$HOME/go/src/code.cloudfoundry.org/cli/out"
 # Add brew-installed python to the path.
 # Must go at the beginning so that it's prioritized over the system installation.
 export PATH="/usr/local/opt/python/libexec/bin:$PATH"