diff --git a/nagios-nrpe/files/check-local_completion b/nagios-nrpe/files/check-local_completion
index d638ae24..ea3ed64b 100644
--- a/nagios-nrpe/files/check-local_completion
+++ b/nagios-nrpe/files/check-local_completion
@@ -4,7 +4,7 @@ _check_local_dynamic_completion() {
     local cur;
     cur=${COMP_WORDS[COMP_CWORD]};
     COMPREPLY=();
-    COMPREPLY=( $( compgen -W '$(grep "\[check_" /etc/nagios/nrpe.d/evolix.cfg | grep -vE "^[[:blank:]]*#" | awk -F"[\\\[\\\]=]" "{print \$2}" | sed "s/check_//")' -- $cur ) );
+    COMPREPLY=( $( compgen -W '$(grep "\[check_" -Rs /etc/nagios/ | grep -vE "^[[:blank:]]*#" | awk -F"[\\\[\\\]=]" "{print \$2}" | sed "s/check_//" | sort | uniq)' -- $cur ) );
 }
 
 complete -F _check_local_dynamic_completion check-local
diff --git a/nagios-nrpe/tasks/check-local.yml b/nagios-nrpe/tasks/check-local.yml
index 1b696292..d28d9113 100644
--- a/nagios-nrpe/tasks/check-local.yml
+++ b/nagios-nrpe/tasks/check-local.yml
@@ -15,6 +15,10 @@
     dest: /usr/local/bin/check-local
     mode: "0755"
 
+- name: Package bash-completion is intalled
+  ansible.builtin.apt:
+    name: bash-completion
+
 - name: Completion for utilitary check-local is installed
   ansible.builtin.copy:
     src: check-local_completion