diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index c830f25d..ae4e717f 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -1,4 +1,3 @@
-
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
   apt:
@@ -9,14 +8,14 @@
     - apt-transport-https
     - ca-certificates
 
-- name: Debian/Ubuntu | Setting webupd8 repository
-  apt_repository:
-    repo: 'ppa:webupd8team/java'
-    codename: 'xenial'
-    update_cache: yes
-
 - when: elasticsearch_install_java
   block:
+    - name: Debian/Ubuntu | Setting webupd8 repository
+      apt_repository:
+        repo: 'ppa:webupd8team/java'
+        codename: 'xenial'
+        update_cache: yes
+
     - name: Debian/Ubuntu | Accept Oracle Java 8 license
       debconf:
         name: oracle-java8-installer
diff --git a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml
index a5ffb14e..628fd8e4 100644
--- a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml
@@ -8,13 +8,13 @@
     - apt-transport-https
     - ca-certificates
 
-- name: Debian/Ubuntu | Setting webupd8 repository
-  apt_repository:
-    repo: 'ppa:webupd8team/java'
-    codename: 'xenial'
-
 - when: logstash_install_java
   block:
+    - name: Debian/Ubuntu | Setting webupd8 repository
+      apt_repository:
+        repo: 'ppa:webupd8team/java'
+        codename: 'xenial'
+
     - name: Debian/Ubuntu | Accept Oracle Java 8 license
       debconf:
         name: oracle-java8-installer