diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
index 41011ddc..a964ad8d 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
@@ -14,6 +14,7 @@
     repo: "{{ package_repos.apt.openjdk.baseurl }}"
     state: present
     update_cache: yes
+  when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
 
 - name: Install openjdk-11-jdk
   apt:
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index bea869a9..98dd74ef 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -14,6 +14,7 @@
     - 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/