diff --git a/ELK/elasticsearch/meta/main.yml b/ELK/elasticsearch/meta/main.yml
index 12a1f439..9b16172f 100644
--- a/ELK/elasticsearch/meta/main.yml
+++ b/ELK/elasticsearch/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
-  - { role: '../../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
-  - { role: '../../../library/roles/openjdk', when: openjdk_install | default(False) }
+  - { role: '../../../library/roles/openjdk' }
diff --git a/hadoop/CDH/meta/main.yml b/hadoop/CDH/meta/main.yml
index 9de6b423..095ee21e 100644
--- a/hadoop/CDH/meta/main.yml
+++ b/hadoop/CDH/meta/main.yml
@@ -1,5 +1,4 @@
 ---
 dependencies:
-  - { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
-  - { role: '../../library/roles/openjdk', when: openjdk_install | default(False) }
+  - { role: '../../library/roles/openjdk' }
   - { role: '../../library/roles/nginx', when: cdh_zeppelin_dedicated_node }
diff --git a/oracle-jdk/defaults/main.yml b/oracle-jdk/defaults/main.yml
index fee92960..ca29e31e 100644
--- a/oracle-jdk/defaults/main.yml
+++ b/oracle-jdk/defaults/main.yml
@@ -1,4 +1,8 @@
 ---
+#
+# 04/19/2019. This role cannot be used anymore as Oracle changed policies
+#
+
 # Supported versions: 8,9
 jdk_default: 8
 # jdk_version is a dictionary because it's possible to install more than one version
diff --git a/oracle-jdk/tasks/main.yml b/oracle-jdk/tasks/main.yml
index 1f5c6073..36153180 100644
--- a/oracle-jdk/tasks/main.yml
+++ b/oracle-jdk/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- block:
+  - name: Oracle JDK cannot be installed anymore, unless you are able to provide a local tar file distribution
+    fail:
+      msg: "Use the openjdk role instead"
+    when: not jdk_use_tarfile
+
 - block: 
     - name: setup the Oracle JDK repository on ubuntu
       apt_repository: repo='{{ jdk_ubuntu_ppa }}' state=present update_cache=yes
@@ -50,16 +56,3 @@
   when: jdk_use_tarfile
   tags: [ 'oracle_jdk', 'jdk' ]
 
-- block:
-    - name: Install a default keyring that includes the Letsencrypt X3 cross signed CA and the INFN CA certificate
-      copy: src=cacerts-jdk7 dest={{ jdk_java_home }}/jre/lib/security/cacerts owner=root group=root mode=0644
-
-  when: jdk_default <= 7 
-  tags: [ 'oracle_jdk', 'jdk', 'jdk_cacert' ]
-
-- block:
-    - name: Change the default keyring. Insert the INFN CA certificate
-      java_cert: cert_path=/usr/local/share/ca-certificates/infn-ca-2015.crt keystore_path={{ jdk_java_home }}/jre/lib/security/cacerts keystore_pass=changeit cert_alias=infn-ca-2015-2030 state=present
-
-  when: jdk_default >= 8
-  tags: [ 'oracle_jdk', 'jdk', 'jdk_cacert' ]
diff --git a/scala-sbt/meta/main.yml b/scala-sbt/meta/main.yml
index f79bb7ea..755ffdc7 100644
--- a/scala-sbt/meta/main.yml
+++ b/scala-sbt/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
-  - { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
-  - { role: '../../library/roles/openjdk', when: openjdk_install | default(False) }
+  - { role: '../../library/roles/openjdk' }
diff --git a/solr/meta/main.yml b/solr/meta/main.yml
index f79bb7ea..755ffdc7 100644
--- a/solr/meta/main.yml
+++ b/solr/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
-  - { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
-  - { role: '../../library/roles/openjdk', when: openjdk_install | default(False) }
+  - { role: '../../library/roles/openjdk' }
diff --git a/tomcat-apache-requirements/meta/main.yml b/tomcat-apache-requirements/meta/main.yml
index 891b1941..5d4f318e 100644
--- a/tomcat-apache-requirements/meta/main.yml
+++ b/tomcat-apache-requirements/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 #dependencies:
-#  - role: '../../library/roles/oracle-jdk'
+#  - role: '../../library/roles/openjdk'
 #  - role: '../../library/roles/apache'
 #  - role: '../../library/roles/tomcat'
 #    when: tomcat_m_instances is not defined
diff --git a/tomcat/meta/main.yml b/tomcat/meta/main.yml
index 66ef7501..755ffdc7 100644
--- a/tomcat/meta/main.yml
+++ b/tomcat/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
-  #- { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
   - { role: '../../library/roles/openjdk' }