diff --git a/tasks/configure_processing_user.yml b/tasks/configure_processing_user.yml
index 9a5b7a63425f9c671641b90af943ce0ce65ff261..670259d654c42c3fdddacc173608e238b6f1d257 100644
--- a/tasks/configure_processing_user.yml
+++ b/tasks/configure_processing_user.yml
@@ -28,6 +28,20 @@
     block: |
       cd ~
 
+# Bash-Completion funktioniert ab 2020.2 anders, s. Abschnitt AUTOCOMPLETION in perldoc bin/subapp_rosetta.pl und bin/disapp_rosetta.pl
+- name: configure .bash-profile for DisApp user
+  ansible.builtin.blockinfile:
+    path: "/home/{{ vault_disapp_user }}/.bash-profile"
+    backup: "no"
+    create: "yes"
+    owner: "{{ vault_disapp_user }}"
+    group: "{{ vault_disapp_group }}"
+    mode: "0644"
+    marker: "# {mark} ANSIBLE MANAGED BLOCK - DisApp-specific"
+    state: present
+    block: |
+      complete -C disapp disapp
+
 - name: configure .bashrc for SubApp user
   ansible.builtin.blockinfile:
     path: "/home/{{ vault_subapp_user }}/.bashrc"
@@ -66,6 +80,20 @@
 
       cd ~
 
+# Bash-Completion funktioniert ab 2020.2 anders, s. Abschnitt AUTOCOMPLETION in perldoc bin/subapp_rosetta.pl und bin/disapp_rosetta.pl
+- name: configure .bash-profile for SubApp user
+  ansible.builtin.blockinfile:
+    path: "/home/{{ vault_subapp_user }}/.bash-profile"
+    backup: "no"
+    create: "yes"
+    owner: "{{ vault_subapp_user }}"
+    group: "{{ vault_subapp_group }}"
+    mode: "0644"
+    marker: "# {mark} ANSIBLE MANAGED BLOCK - SubApp-specific"
+    state: present
+    block: |
+      complete -C subapp subapp
+
 - name: Add aliases for DisApp user
   ansible.builtin.blockinfile:
     path: "/home/{{ vault_disapp_user }}/.bash_aliases"
diff --git a/tasks/install_subapp.yml b/tasks/install_subapp.yml
index 2e0d3400b48943e7342eb6eda1e24a520bc07d26..171038bcfcb1391ffc17c7e530280a77aca3cd96 100644
--- a/tasks/install_subapp.yml
+++ b/tasks/install_subapp.yml
@@ -220,18 +220,6 @@
       owner: "{{ vault_subapp_user }}"
       group: "{{ vault_subapp_group }}"
 
-# Bash-Completion funktioniert ab 2020.2 anders, s. Abschnitt AUTOCOMPLETION in perldoc bin/subapp_rosetta.pl und bin/disapp_rosetta.pl
-# https://ansible-lint.readthedocs.io/en/latest/usage/#false-positives-skipping-rules
-- name: Bash-Completion aktivieren    # noqa command-instead-of-shell
-  ansible.builtin.shell:
-    chdir: "/usr/local/bin/"
-    cmd: "{{ item }}"
-    executable: "/usr/bin/bash"       # Yup, this REALLY needs a Bash, so we HAVE to use ansible.builtin.shell, so don't show linter errors
-  loop:
-    - "complete -C subapp_rosetta.pl subapp_rosetta.pl"
-    - "complete -C disapp_rosetta.pl disapp_rosetta.pl"
-  changed_when: false
-
 - name: alte Bash-Completion entfernen
   ansible.builtin.file:
     path: "/home/{{ vault_subapp_user }}/.bash_completion"