diff --git a/roles/bash/files/profile b/roles/bash/files/profile
index 06fb5e7..18a1ca1 100644
--- a/roles/bash/files/profile
+++ b/roles/bash/files/profile
@@ -433,17 +433,10 @@ colortest() {
 stty -ixon # disable ctrl-s and ctrl-q
 _update_colors "${BACKGROUND:-dark}"
 
-# Enable available completion helpers
-# shellcheck disable=SC1090 # no need to shellcheck bash completion files
-while read -r d; do [ -d "$d" ] && for f in "$d"/*; do [ -f "$f" ] && . "$f"; done; done <<EOL
-    $LOCAL_PREFIX/etc/bash_completion.d
-    $XDG_CONFIG_HOME/bash/completion.d
-EOL
-unset d f
-
-# Source a local bash configuration if available
-if [ -f "$LOCAL_CONFIG/bash/profile" ]; then
-    # shellcheck disable=SC1090
-    source "$LOCAL_CONFIG/bash/profile"
-fi
+# shellcheck disable=SC1090
+while read -r f; do [ -f "$f" ] && source "$f"; done <<EOF
+    /usr/share/bash-completion/bash_completion
+    "$LOCAL_CONFIG/bash/profile"
+EOF
+unset f
 
diff --git a/roles/bash/tasks/main.yml b/roles/bash/tasks/main.yml
index 2d86715..c1ad803 100644
--- a/roles/bash/tasks/main.yml
+++ b/roles/bash/tasks/main.yml
@@ -1,11 +1,22 @@
 - name: Install latest bash (Debian)
   when: ansible_os_family == "Debian"
   become: yes
-  apt: name=bash state=latest update_cache=yes
+  apt:
+      name: "{{ item }}"
+      state: latest
+      update_cache: yes
+  loop:
+      - bash
+      - bash-completion
 
 - name: Install latest bash (macOS)
   when: ansible_os_family == "Darwin"
-  homebrew: name=bash state=latest
+  homebrew:
+      name: "{{ item }}"
+      state: latest
+  loop:
+      - bash
+      - bash-completion
 
 - name: Remove pre-installed bash configurations which could cause conflicts
   file:
@@ -22,7 +33,7 @@
   loop:
       - "~/.cache/bash"
       - "~/.config/bash"
-      - "~/.config/bash/completion.d"
+      - "~/.local/share/bash-completion/completions"
 
 - name: Deploy bash profile
   file: