diff --git a/bucket/openjdk.json b/bucket/openjdk.json
index 7c1a141ac..7c30bf5c2 100644
--- a/bucket/openjdk.json
+++ b/bucket/openjdk.json
@@ -15,13 +15,13 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "re": "/jdk(?<major>[\\d.]+)/(?<random>[a-fA-F0-9]{32})/(?<build>[\\d]+)/GPL/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
+        "re": "/(?<type>early_access|GA)/(?<path>jdk(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries)?)/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
         "replace": "${version}-${build}${ea}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://download.java.net/java/GA/jdk$matchMajor/$matchRandom/$matchBuild/GPL/$matchFile"
+                "url": "https://download.java.net/java/$matchType/$matchPath/$matchFile"
             }
         },
         "hash": {
diff --git a/bucket/openjdk12.json b/bucket/openjdk12.json
index e4533134f..18b6c9ca3 100644
--- a/bucket/openjdk12.json
+++ b/bucket/openjdk12.json
@@ -15,13 +15,13 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "re": "/jdk(?<major>12[\\d.]*)/(?<random>[a-fA-F0-9]{32})/(?<build>[\\d]+)/GPL/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
+        "re": "/(?<type>early_access|GA)/(?<path>jdk(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries)?)/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
         "replace": "${version}-${build}${ea}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://download.java.net/java/GA/jdk$matchMajor/$matchRandom/$matchBuild/GPL/$matchFile"
+                "url": "https://download.java.net/java/$matchType/$matchPath/$matchFile"
             }
         },
         "hash": {
diff --git a/bucket/openjdk13.json b/bucket/openjdk13.json
index 3290c6328..74e28e3da 100644
--- a/bucket/openjdk13.json
+++ b/bucket/openjdk13.json
@@ -15,13 +15,13 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "re": "/(?<type>early_access|GA)/jdk(?<major>13[\\d.]*)/(?<build>[\\d]+)/(?<random>([a-fA-F0-9]{32}|GPL|binaries)?)/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
+        "re": "/(?<type>early_access|GA)/(?<path>jdk(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries)?)/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
         "replace": "${version}-${build}${ea}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://download.java.net/java/$matchType/jdk$matchMajor/$matchBuild/$matchRandom/$matchFile"
+                "url": "https://download.java.net/java/$matchType/$matchPath/$matchFile"
             }
         },
         "hash": {