diff --git a/toolboxes/bluefin-cli/files/etc/profile.d/00-bluefin-cli-brew-firstrun.sh b/toolboxes/bluefin-cli/files/etc/profile.d/00-bluefin-cli-brew-firstrun.sh
index 3f59474..5119ed3 100644
--- a/toolboxes/bluefin-cli/files/etc/profile.d/00-bluefin-cli-brew-firstrun.sh
+++ b/toolboxes/bluefin-cli/files/etc/profile.d/00-bluefin-cli-brew-firstrun.sh
@@ -2,6 +2,8 @@ if test "$(id -u)" -gt "0"; then
   green=$'\033[32m'
   bold=$'\033[1m'
   normal=$'\033[0m'
+  HOMEBREW_REPOSITORY=/home/linuxbrew/.linuxbrew
+  export HOMEBREW_REPOSITORY
   if test ! -f /etc/linuxbrew.firstrun; then
     printf "\nBluefin-CLI First Run Setup\n\n"
     printf "Setting up sudo for ${bold}${USER}${normal}...\t\t\t "
diff --git a/toolboxes/bluefin-cli/files/etc/profile.d/bash_completion.sh b/toolboxes/bluefin-cli/files/etc/profile.d/bash_completion.sh
index 684a3dc..c899b24 100644
--- a/toolboxes/bluefin-cli/files/etc/profile.d/bash_completion.sh
+++ b/toolboxes/bluefin-cli/files/etc/profile.d/bash_completion.sh
@@ -8,13 +8,23 @@ if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO
         [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] &&
             . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
         if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
-            # Source completion code.
+            # Source completion code
             . /usr/share/bash-completion/bash_completion
         fi
         if shopt -q progcomp && [ -r /usr/local/share/bash-completion/bash_completion ]; then
             # Source completion code.
             . /usr/local/share/bash-completion/bash_completion
         fi
+        if test -L /home/linuxbrew/.linuxbrew/etc/bash_completion.d/brew; then
+            /home/linuxbrew/.linuxbrew/bin/brew completions link.
+        fi
+        if test -d /home/linuxbrew/.linuxbrew/etc/bash_completion.d; then
+            for rc in /home/linuxbrew/.linuxbrew/etc/bash_completion.d/*; do
+              if test -r "$rc"; then
+                . "$rc"
+              fi
+            done
+            unset rc
+        fi
     fi
-
 fi