diff --git a/advanced/bash-completion/pihole-ftl.bash b/advanced/bash-completion/pihole-ftl.bash
new file mode 100644
index 00000000..d652f007
--- /dev/null
+++ b/advanced/bash-completion/pihole-ftl.bash
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Bash completion script for pihole-FTL
+#
+# This completion script provides tab completion for pihole-FTL CLI flags and commands.
+# It uses the `pihole-FTL --complete` command to generate the completion options.
+_complete_FTL() { mapfile -t COMPREPLY < <(pihole-FTL --complete "${COMP_WORDS[@]}"); }
+
+complete -F _complete_FTL pihole-FTL
diff --git a/advanced/bash-completion/pihole b/advanced/bash-completion/pihole.bash
similarity index 65%
rename from advanced/bash-completion/pihole
rename to advanced/bash-completion/pihole.bash
index acc5b71a..736a75d9 100644
--- a/advanced/bash-completion/pihole
+++ b/advanced/bash-completion/pihole.bash
@@ -1,3 +1,7 @@
+#!/bin/bash
+#
+# Bash completion script for pihole
+#
 _pihole() {
     local cur prev opts opts_lists opts_checkout opts_debug opts_logging opts_query opts_update opts_networkflush
     COMPREPLY=()
@@ -8,40 +12,40 @@ _pihole() {
     case "${prev}" in
         "pihole")
             opts="allow allow-regex allow-wild deny checkout debug disable enable flush help logging query repair regex reloaddns reloadlists setpassword status tail uninstall updateGravity updatePihole version wildcard networkflush api"
-            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts}" -- "${cur}")
         ;;
         "allow"|"deny"|"wildcard"|"regex"|"allow-regex"|"allow-wild")
             opts_lists="\not \--delmode \--quiet \--list \--help"
-            COMPREPLY=( $(compgen -W "${opts_lists}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_lists}" -- "${cur}")
         ;;
         "checkout")
             opts_checkout="core ftl web master dev"
-            COMPREPLY=( $(compgen -W "${opts_checkout}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_checkout}" -- "${cur}")
         ;;
         "debug")
             opts_debug="-a"
-            COMPREPLY=( $(compgen -W "${opts_debug}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_debug}" -- "${cur}")
         ;;
         "logging")
             opts_logging="on off 'off noflush'"
-            COMPREPLY=( $(compgen -W "${opts_logging}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_logging}" -- "${cur}")
         ;;
         "query")
             opts_query="--partial --all"
-            COMPREPLY=( $(compgen -W "${opts_query}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_query}" -- "${cur}")
         ;;
         "updatePihole"|"-up")
             opts_update="--check-only"
-            COMPREPLY=( $(compgen -W "${opts_update}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_update}" -- "${cur}")
         ;;
         "networkflush")
             opts_networkflush="--arp"
-            COMPREPLY=( $(compgen -W "${opts_networkflush}" -- ${cur}) )
+            mapfile -t COMPREPLY < <(compgen -W "${opts_networkflush}" -- "${cur}")
         ;;
         "core"|"web"|"ftl")
             if [[ "$prev2" == "checkout" ]]; then
                 opts_checkout="master development"
-                COMPREPLY=( $(compgen -W "${opts_checkout}" -- ${cur}) )
+                mapfile -t COMPREPLY < <(compgen -W "${opts_checkout}" -- "${cur}")
             else
                 return 1
             fi
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index daacb9a3..9d3bd2b3 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1137,7 +1137,8 @@ installScripts() {
         install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./automated\ install/uninstall.sh
         install -o "${USER}" -Dm755 -t "${PI_HOLE_INSTALL_DIR}" ./advanced/Scripts/COL_TABLE
         install -o "${USER}" -Dm755 -t "${PI_HOLE_BIN_DIR}" pihole
-        install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
+        install -Dm644 ./advanced/bash-completion/pihole.bash /etc/bash_completion.d/pihole
+        install -Dm644 ./advanced/bash-completion/pihole-ftl.bash /etc/bash_completion.d/pihole-FTL
         printf "%b  %b %s\\n" "${OVER}" "${TICK}" "${str}"
 
     else
diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
index e8dec36a..dfe0871e 100755
--- a/automated install/uninstall.sh	
+++ b/automated install/uninstall.sh	
@@ -89,6 +89,7 @@ removePiholeFiles() {
     ${SUDO} rm -rf /opt/pihole/ &> /dev/null
     ${SUDO} rm -f /usr/local/bin/pihole &> /dev/null
     ${SUDO} rm -f /etc/bash_completion.d/pihole &> /dev/null
+    ${SUDO} rm -f /etc/bash_completion.d/pihole-FTL &> /dev/null
     ${SUDO} rm -f /etc/sudoers.d/pihole &> /dev/null
     echo -e "  ${TICK} Removed config files"