diff --git a/bucket/dragonwell8.json b/bucket/dragonwell8.json
index d59c0d1ca..4e20fa1e4 100644
--- a/bucket/dragonwell8.json
+++ b/bucket/dragonwell8.json
@@ -1,12 +1,12 @@
 {
     "description": "Alibaba Dragonwell, a downstream version of OpenJDK, is the in-house OpenJDK implementation at Alibaba",
-    "version": "8.2.2",
+    "version": "8.3.3",
     "homepage": "https://www.aliyun.com/product/dragonwell",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/alibaba/dragonwell8/releases/download/v8.2.2-GA/Alibaba_Dragonwell_8.2.2-Experimental_Windows_x64.zip",
-            "hash": "fe5f4c420f10e20bd8a6de5325aacdfc4c0b4f908885c17929a015ff69994d22"
+            "url": "https://github.com/alibaba/dragonwell8/releases/download/dragonwell-8.3.3-GA/Alibaba_Dragonwell_8.3.3-Experimental_Windows_x64.zip",
+            "hash": "34eacdd1770039cfe7e08ec8bc715e68f7b9b0e7c41d5ac4a10d301196231932"
         }
     },
     "extract_dir": "j2sdk-image",
@@ -15,16 +15,17 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "github": "https://github.com/alibaba/dragonwell8"
+        "github": "https://github.com/alibaba/dragonwell8",
+        "regex": "dragonwell-([\\d.]+)-GA"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/alibaba/dragonwell8/releases/download/v$version-GA/Alibaba_Dragonwell_$version-Experimental_Windows_x64.zip"
+                "url": "https://github.com/alibaba/dragonwell8/releases/download/dragonwell-$version-GA/Alibaba_Dragonwell_$version-Experimental_Windows_x64.zip"
             }
         },
         "hash": {
-            "url": "https://github.com/alibaba/dragonwell8/releases/tag/v$version-GA",
+            "url": "https://github.com/alibaba/dragonwell8/releases/tag/dragonwell-$version-GA",
             "find": "$sha256\\s+$basename"
         }
     }
diff --git a/bucket/jmc.json b/bucket/jmc.json
index d7962c126..49b56a141 100644
--- a/bucket/jmc.json
+++ b/bucket/jmc.json
@@ -1,15 +1,15 @@
 {
     "description": "JDK Mission Control",
     "homepage": "https://openjdk.java.net/projects/jmc/",
-    "version": "7-14",
+    "version": "7.0.1-01",
     "license": "UPL-1.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.java.net/java/GA/jmc7/14/jmc-7_windows-x64_bin.zip",
-            "hash": "e9f7e6d97a347b583d2dc03d3f1df9806363bfc2d099e411d9435b204a74005e"
+            "url": "https://download.java.net/java/GA/jmc7.0.1/01/UPL/jmc-7.0.1+01_windows-x64_bin.zip",
+            "hash": "16cd4f67e71bd77d9303e94431a047ed060f595f297586c2ef17d55fbd7ace38"
         }
     },
-    "extract_dir": "jmc-7+14_windows-x64\\bin",
+    "extract_dir": "jmc-7.0.1+01_windows-x64\\bin",
     "env_set": {
         "JAVA_HOME": "$dir"
     },
@@ -22,7 +22,7 @@
     "persist": "configuration",
     "checkver": {
         "url": "https://jdk.java.net/jmc/",
-        "re": "/(?<type>early_access|GA)/(?<path>jmc(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries)?)/(?<file>jmc-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
+        "re": "/(?<type>early_access|GA)/(?<path>jmc(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries|/UPL)?)/(?<file>jmc-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
         "replace": "${version}-${build}${ea}"
     },
     "autoupdate": {
diff --git a/bucket/ojdkbuild13-full.json b/bucket/ojdkbuild13-full.json
index a3108cc32..1ab290ab9 100644
--- a/bucket/ojdkbuild13-full.json
+++ b/bucket/ojdkbuild13-full.json
@@ -13,20 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md",
-        "re": "download/(?<folder>(?:java-13-openjdk-)?(?<version>(?<short>13[\\d.]+)\\.[\\d]+-(?<build>[\\db.]+)))/(?<url>java-(?<major>[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.msi"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.msi",
-                "extract_dir": "ojdkbuild\\java-$matchMajor-openjdk-$matchShort-$matchBuild"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256"
-        }
     }
 }
diff --git a/bucket/ojdkbuild13.json b/bucket/ojdkbuild13.json
index 4f3250201..b1d71625d 100644
--- a/bucket/ojdkbuild13.json
+++ b/bucket/ojdkbuild13.json
@@ -13,20 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md",
-        "re": "download/(?<folder>(?:java-13-openjdk-)?(?<version>13[\\db.-]+))/(?<url>java-(?<short>[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.zip"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.zip",
-                "extract_dir": "$matchUrl.x86_64"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256"
-        }
     }
 }
diff --git a/bucket/ojdkbuild14-full.json b/bucket/ojdkbuild14-full.json
new file mode 100644
index 000000000..7674d5fca
--- /dev/null
+++ b/bucket/ojdkbuild14-full.json
@@ -0,0 +1,32 @@
+{
+    "description": "OpenJDK 14 binaries built using source code from the CentOS project",
+    "homepage": "https://github.com/ojdkbuild/ojdkbuild",
+    "version": "14.0.1.7-1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-14-openjdk-14.0.1.7-0/java-14-openjdk-14.0.1.7-1.windows.ojdkbuild.x86_64.msi",
+            "hash": "3ee6ec20f472bcc9608153b659d63320a0471968d756a9e7d9e5997c3c580e7f",
+            "extract_dir": "ojdkbuild\\java-14-openjdk-14.0.1-1"
+        }
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md",
+        "re": "download/(?<folder>(?:java-14-openjdk-)?(?<version>(?<short>14[\\d.]+)\\.[\\d]+-(?<build>[\\db.]+)))/(?<url>java-(?<major>[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.msi"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.msi",
+                "extract_dir": "ojdkbuild\\java-$matchMajor-openjdk-$matchShort-$matchBuild"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/ojdkbuild14.json b/bucket/ojdkbuild14.json
new file mode 100644
index 000000000..072ec0ab5
--- /dev/null
+++ b/bucket/ojdkbuild14.json
@@ -0,0 +1,32 @@
+{
+    "description": "OpenJDK 14 binaries built using source code from the CentOS project",
+    "homepage": "https://github.com/ojdkbuild/ojdkbuild",
+    "version": "14.0.1.7-1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-14-openjdk-14.0.1.7-0/java-14-openjdk-14.0.1.7-1.windows.ojdkbuild.x86_64.zip",
+            "hash": "f8342e3424f79adad7d3db759fd95007166008ee1db6e7637e9339ef26390986",
+            "extract_dir": "java-14-openjdk-14.0.1.7-1.windows.ojdkbuild.x86_64"
+        }
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://raw.githubusercontent.com/ojdkbuild/ojdkbuild/master/README.md",
+        "re": "download/(?<folder>(?:java-14-openjdk-)?(?<version>14[\\db.-]+))/(?<url>java-(?<short>[\\d.]+)-openjdk-([\\db.-]+)(.ojdkbuild|.windows){2}).x86_64.zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/ojdkbuild/ojdkbuild/releases/download/$matchFolder/$matchUrl.x86_64.zip",
+                "extract_dir": "$matchUrl.x86_64"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/sapmachine13-jre.json b/bucket/sapmachine13-jre.json
index 16603af6d..633e92193 100644
--- a/bucket/sapmachine13-jre.json
+++ b/bucket/sapmachine13-jre.json
@@ -13,21 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
-        "re": "(?<sap>/sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)_windows-x64_bin).zip"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
-            }
-        },
-        "hash": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
-            "find": "^($sha256)\\s"
-        },
-        "extract_dir": "sapmachine-jre-$matchVersion"
     }
 }
diff --git a/bucket/sapmachine13.json b/bucket/sapmachine13.json
index 131a72402..9d799bbe2 100644
--- a/bucket/sapmachine13.json
+++ b/bucket/sapmachine13.json
@@ -13,21 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
-        "re": "(?<sap>/sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
-            }
-        },
-        "hash": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
-            "find": "^($sha256)\\s"
-        },
-        "extract_dir": "sapmachine-jdk-$matchVersion"
     }
 }
diff --git a/bucket/zulu14.json b/bucket/zulu14.json
new file mode 100644
index 000000000..c9413561f
--- /dev/null
+++ b/bucket/zulu14.json
@@ -0,0 +1,51 @@
+{
+    "description": "Zulu is certified build of OpenJDK",
+    "homepage": "https://www.azul.com/products/zulu-community/",
+    "version": "14.28.21",
+    "license": {
+        "identifier": "GPL-2.0-only WITH Classpath-exception-2.0",
+        "url": "https://www.azulsystems.com/license/zulu_third_party_licenses.html"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip",
+            "hash": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
+            "extract_dir": "zulu14.28.21-ca-jdk14.0.1-win_x64"
+        },
+        "32bit": {
+            "url": "https://cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_i686.zip",
+            "hash": "b2c9629ea1a157770818a3b4ad9da596b9d9e013dfd376d8edb35590446764bb",
+            "extract_dir": "zulu14.28.21-ca-jdk14.0.1-win_i686"
+        }
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/?jdk_version=14&bundle_type=jdk&features=&ext=zip&os=windows&arch=x86&hw_bitness=64",
+        "jsonpath": "$.name",
+        "regex": "(?<name>zulu(?<version>[\\d.]+)-ca-jdk(?<java>[\\d.]+)-win)_x64.zip",
+        "replace": "${version}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://cdn.azul.com/zulu/bin/$matchName_x64.zip",
+                "extract_dir": "$matchName_x64",
+                "hash": {
+                    "url": "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/?jdk_version=14&bundle_type=jdk&features=&ext=zip&os=windows&arch=x86&hw_bitness=64",
+                    "jp": "$.sha256_hash"
+                }
+            },
+            "32bit": {
+                "url": "https://cdn.azul.com/zulu/bin/$matchName_i686.zip",
+                "extract_dir": "$matchName_i686",
+                "hash": {
+                    "url": "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/?jdk_version=14&bundle_type=jdk&features=&ext=zip&os=windows&arch=x86&hw_bitness=32",
+                    "jp": "$.sha256_hash"
+                }
+            }
+        }
+    }
+}