diff --git a/openjdk/tasks/main.yml b/openjdk/tasks/main.yml
index 45fe016..b11725d 100644
--- a/openjdk/tasks/main.yml
+++ b/openjdk/tasks/main.yml
@@ -8,10 +8,16 @@
       with_nested:
         - '{{ openjdk_version }}'
         - '{{ openjdk_pkgs }}'
-        #    - [ 'jre', 'jre-headless', 'jdk' ]
       notify: Set the default OpenJDK
+      register: openjdk_installed
 
-    - name: Set fact jdk_installed
-      set_fact: jdk_installed=true
+    - name: Rebuild the Ubuntu keystore
+      command: update-ca-certificates --fresh
+      when: ( openjdk_installed | changed )
+
+    - name: Set the default OpenJDK
+      shell: update-java-alternatives -s java-1.{{ item }}.0-openjdk-amd64
+      with_items: '{{ openjdk_default }}'
+      when: ( openjdk_installed | changed )
 
   tags: [ 'jdk', 'openjdk' ]