diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
index a964ad8d..5b490844 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
@@ -1,20 +1,32 @@
 
 ---
 
-#- name: Install OpenDistro dependencies
-#  apt:
-#    name: [
-#      'unzip', 'wget', 'curl',
-#      'apt-transport-https', software-properties-common
-#    ]
-#    state: present
-
-- name: Add openjdk repository
-  apt_repository:
-    repo: "{{ package_repos.apt.openjdk.baseurl }}"
-    state: present
+- name: Update cache
+  apt:
     update_cache: yes
+
+- name: Debian 9 (Stretch)
   when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
+  block:
+  
+    - name: Install OpenDistro dependencies
+      apt:
+        name: [
+          'unzip', 'wget', 'curl', 'apt-transport-https', software-properties-common
+        ]
+        state: present
+
+    - name: Add the repository key for Debian's Stretch Backports repository
+      ansible.builtin.apt_key:
+        keyserver: keyserver.ubuntu.com
+        id: 648ACFD622F3D138
+    
+    - name: Add openjdk repository
+      apt_repository:
+        repo: "{{ package_repos.apt.openjdk.baseurl }}"
+        state: present
+        update_cache: yes
+        filename: 'wazuh-openjdk'
 
 - name: Install openjdk-11-jdk
   apt:
@@ -34,6 +46,7 @@
       apt_repository:
         repo: "{{ package_repos.apt.opendistro.baseurl }}"
         state: present
+        filename: 'wazuh-opendistro'
         update_cache: yes
 
 - name: Install OpenDistro
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index 98dd74ef..463b78e6 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -14,9 +14,13 @@
     - name: Remove performance analyzer plugin from elasticsearch
       become: true
       command: ./elasticsearch-plugin remove opendistro-performance-analyzer
-      ignore_errors: true
       args:
         chdir: /usr/share/elasticsearch/bin/
+      register: remove_elasticsearch_performance_analyzer
+      failed_when:
+        - remove_elasticsearch_performance_analyzer.rc != 0
+        - '"not found" not in remove_elasticsearch_performance_analyzer.stderr'
+      changed_when: "remove_elasticsearch_performance_analyzer.rc == 0"
 
     - name: Remove elasticsearch configuration file
       file: