diff --git a/README.md b/README.md
index 50ba94a520fbc9112d5b939f9bc88d477502a2a5..9a5c5ec7d2d83344e1022d61338d71fee4470ff2 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ It can also install Oracle JDK 8 in parallel (default is always openjdk) and mav
 ## Role Variables
 
 ```yaml
-java_openjdk_version: "13.0.1"
-java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjdk-{{ java_openjdk_version }}_linux-x64_bin.tar.gz"
+java_openjdk_version: "13.0.1+9"
+java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/OpenJDK{{ java_openjdk_version | regex_replace('^(\\d+).*', '\\1') }}U-jdk_x64_linux_hotspot_{{ java_openjdk_version | regex_replace('\\+', '_') }}.tar.gz"
 java_openjfx_version: "13.0.1"
 java_openjfx_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjfx-{{ java_openjfx_version }}_linux-x64_bin-sdk.zip"
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 807015292151f41a59eac4985f08e9cab5eca21f..65d9ba723b8e9951dc566a9fec9c73ed8aa12779 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
-java_openjdk_version: "13.0.1"
-java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjdk-{{ java_openjdk_version }}_linux-x64_bin.tar.gz"
+java_openjdk_version: "13.0.1+9"
+java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/OpenJDK{{ java_openjdk_version | regex_replace('^(\\d+).*', '\\1') }}U-jdk_x64_linux_hotspot_{{ java_openjdk_version | regex_replace('\\+', '_') }}.tar.gz"
 java_openjfx_version: "13.0.1"
 java_openjfx_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjfx-{{ java_openjfx_version }}_linux-x64_bin-sdk.zip"
 
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
index 0fc83bebe6670f4f657cda8cd81f581b701d2ecb..9f9427fff8011481b0fce39b1fda907b4293016c 100644
--- a/molecule/default/tests/test_default.py
+++ b/molecule/default/tests/test_default.py
@@ -6,7 +6,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 ).get_hosts("all")
 
 
-JAVA_VERSION = "13.0.1"
+JAVA_VERSION = "13.0.1+9"
 JAVA_HOME = "/opt/java/jdk-{}".format(JAVA_VERSION)
 JAVAFX_VERSION = "13.0.1"
 PATH_TO_FX = "/opt/java/javafx-sdk-{}/lib".format(JAVAFX_VERSION)
@@ -19,7 +19,7 @@ def test_java_version(host):
     if host.ansible.get_variables()["inventory_hostname"] == "ics-ans-role-java-and-oracle-jdk8":
         assert 'java version "1.8.0_{}"'.format(ORACLE_JDK8_VERSION) in cmd.stdout
     else:
-        assert 'openjdk version "{}"'.format(JAVA_VERSION) in cmd.stdout
+        assert 'build {}'.format(JAVA_VERSION) in cmd.stdout
 
 
 def test_java_home(host):