diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index 67a34e7e..69c698f0 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -38,7 +38,7 @@
   apt_repository:
     repo: 'deb https://artifacts.elastic.co/packages/7.x/apt stable main'
     state: present
-    filename: 'elastic_repo'
+    filename: 'elastic_repo_7'
     update_cache: true
   changed_when: false
 
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
index 16366dfc..d02664c8 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
@@ -2,7 +2,7 @@
 
 - name: RedHat/CentOS/Fedora | Install Elastic repo
   yum_repository:
-    name: elastic_repo
+    name: elastic_repo_7
     description: Elastic repository for 7.x packages
     baseurl: https://artifacts.elastic.co/packages/7.x/yum
     gpgkey: https://artifacts.elastic.co/GPG-KEY-elasticsearch
diff --git a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
index 95663765..ae6ff0e9 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
@@ -17,7 +17,7 @@
   apt_repository:
     repo: 'deb https://artifacts.elastic.co/packages/7.x/apt stable main'
     state: present
-    filename: 'elastic_repo'
+    filename: 'elastic_repo_7'
     update_cache: true
   changed_when: false
 
diff --git a/roles/elastic-stack/ansible-kibana/tasks/RedHat.yml b/roles/elastic-stack/ansible-kibana/tasks/RedHat.yml
index 1364552b..abb8b0c0 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/RedHat.yml
@@ -1,7 +1,7 @@
 ---
 - name: RedHat/CentOS/Fedora | Install Elastic repo
   yum_repository:
-    name: elastic_repo
+    name: elastic_repo_7
     description: Elastic repository for 7.x packages
     baseurl: https://artifacts.elastic.co/packages/7.x/yum
     gpgkey: https://artifacts.elastic.co/GPG-KEY-elasticsearch
diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml
index f2152d00..584becc7 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/main.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@@ -74,24 +74,27 @@
   tags: configure
 
 - name: Checking Wazuh-APP version
-  shell: |
-    set -o pipefail
-    grep -c -E 'version.*{{ elastic_stack_version }}' /usr/share/kibana/plugins/wazuh/package.json | xargs echo
+  shell: >-
+    grep -c -E 'version.*{{ elastic_stack_version }}' /usr/share/kibana/plugins/wazuh/package.json
   args:
     executable: /bin/bash
     removes: /usr/share/kibana/plugins/wazuh/package.json
   register: wazuh_app_verify
   changed_when: false
-  tags: install
+  failed_when:
+    -  wazuh_app_verify.rc != 0
+    -  wazuh_app_verify.rc != 1
 
 - name: Removing old Wazuh-APP
-  command: /usr/share/kibana/bin/kibana-plugin remove wazuh
-  when: wazuh_app_verify.stdout == "0"
+  command: /usr/share/kibana/bin/kibana-plugin --allow-root remove wazuh
+  when: wazuh_app_verify.rc == 1
   tags: install
 
 - name: Removing bundles
   file: path=/usr/share/kibana/optimize/bundles state=absent
-  when: wazuh_app_verify.stdout == "0"
+  become: yes
+  become_user: kibana
+  when: wazuh_app_verify.rc == 1
   tags: install
 
 - name: Install Wazuh-APP (can take a while)