diff --git a/oracle-jdk/defaults/main.yml b/oracle-jdk/defaults/main.yml
index bb8d7bc6..ed327dec 100644
--- a/oracle-jdk/defaults/main.yml
+++ b/oracle-jdk/defaults/main.yml
@@ -6,8 +6,12 @@ jdk_version:
   - '{{ jdk_default }}'
 jdk_java_home: '/usr/lib/jvm/java-{{ jdk_default }}-oracle'
 jdk_pkg_state: installed
-jdk_install_strong_encryption_policy: False
+oracle_jdk_packages:
+  - 'oracle-java{{ jdk_default }}-installer'
+  - 'oracle-java{{ jdk_default }}-set-default'
+jdk_install_strong_encryption_policy: True
+
 # If we want a different oracle jdk set the following variables in the local playbook:
+jdk_use_tarfile: False
 #  jdk_java_home: /usr/lib/jvm/java-7-0-25
-#  jdk_use_tarfile: True
 #  jdk_tarfile: oracle-jdk-7.0.25.tar.gz
diff --git a/oracle-jdk/files/jdk-7-US_export_policy.jar b/oracle-jdk/files/jdk-7-US_export_policy.jar
deleted file mode 100644
index 71732130..00000000
Binary files a/oracle-jdk/files/jdk-7-US_export_policy.jar and /dev/null differ
diff --git a/oracle-jdk/files/jdk-7-local_policy.jar b/oracle-jdk/files/jdk-7-local_policy.jar
deleted file mode 100644
index c34d0362..00000000
Binary files a/oracle-jdk/files/jdk-7-local_policy.jar and /dev/null differ
diff --git a/oracle-jdk/files/jdk-8-US_export_policy.jar b/oracle-jdk/files/jdk-8-US_export_policy.jar
deleted file mode 100644
index 251b102c..00000000
Binary files a/oracle-jdk/files/jdk-8-US_export_policy.jar and /dev/null differ
diff --git a/oracle-jdk/files/jdk-8-local_policy.jar b/oracle-jdk/files/jdk-8-local_policy.jar
deleted file mode 100644
index 1c58939b..00000000
Binary files a/oracle-jdk/files/jdk-8-local_policy.jar and /dev/null differ
diff --git a/oracle-jdk/tasks/main.yml b/oracle-jdk/tasks/main.yml
index 127827c3..2ddc9648 100644
--- a/oracle-jdk/tasks/main.yml
+++ b/oracle-jdk/tasks/main.yml
@@ -15,33 +15,35 @@
   tags: jdk
 
 - name: Install the latest version of Oracle JDK
-  apt: pkg=oracle-java{{ item }}-installer state={{ jdk_pkg_state }} force=yes
+  apt: pkg={{ item }} state={{ jdk_pkg_state }} force=yes
+  when: not jdk_use_tarfile
+  with_items: oracle_jdk_packages
+  tags: jdk
+
+- name: Install the extended security JCE Oracle JDK package
+  apt: pkg=oracle-java{{ item }}-unlimited-jce-policy state={{ jdk_pkg_state }} force=yes
   when: jdk_use_tarfile is not defined or not jdk_use_tarfile
   with_items: jdk_version
+  when:
+    - not jdk_use_tarfile
+    - jdk_install_strong_encryption_policy
   tags: jdk
 
 - name: Set the JDK default via update-alternatives
   apt: pkg=oracle-java{{ item }}-set-default state={{ jdk_pkg_state }} force=yes
   with_items: jdk_default
-  when: jdk_use_tarfile is not defined or not jdk_use_tarfile
-  notify:
-    Set the default Oracle JDK
-  when: jdk_default is defined
+  when:
+    - not jdk_use_tarfile
+    - jdk_default is defined
+  notify: Set the default Oracle JDK
   tags: jdk
 
 - name: Install a custom version of Oracle JDK from a tar file
   unarchive: src={{ jdk_tarfile }} dest={{ jdk_java_home_prefix }}
-  when: jdk_use_tarfile is defined and jdk_use_tarfile
+  when: jdk_use_tarfile
   tags: jdk
 
 - name: Set fact jdk_installed
   set_fact: jdk_installed=True
-  tags: [ 'jdk', 'jdk_security' ]
+  tags: jdk
 
-- name: Install the strong encryption policy files
-  copy: src=jdk-{{ item.0 }}-{{ item.1 }} dest={{ jdk_java_home }}/jre/lib/security/{{ item.1}} mode=0444 owner=root group=root
-  with_nested:
-    - '{{ jdk_version }}'
-    - [ 'US_export_policy.jar', 'local_policy.jar' ]
-  when: jdk_install_strong_encryption_policy
-  tags: [ 'jdk', 'jdk_security' ]