diff --git a/bucket/liberica15-full-jre.json b/bucket/liberica15-full-jre.json
index a6f15c920..7ca7078e6 100644
--- a/bucket/liberica15-full-jre.json
+++ b/bucket/liberica15-full-jre.json
@@ -1,5 +1,5 @@
 {
-    "description": "BellSoft Liberica is a 100% open-source Java 14 implementation",
+    "description": "BellSoft Liberica is a 100% open-source Java 15 implementation",
     "homepage": "https://bell-sw.com/java",
     "version": "15.0.2-10",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
@@ -17,26 +17,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=15&bundle-type=jre-full&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
-        "jsonpath": "$.version",
-        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-amd64-full.zip"
-            },
-            "32bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-i586-full.zip"
-            }
-        },
-        "hash": {
-            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
-            "jsonpath": "$.sha1"
-        },
-        "extract_dir": "jre-$matchMajor-full"
     }
 }
diff --git a/bucket/liberica15-full.json b/bucket/liberica15-full.json
index 1ff1c5b61..aa9a97470 100644
--- a/bucket/liberica15-full.json
+++ b/bucket/liberica15-full.json
@@ -1,5 +1,5 @@
 {
-    "description": "BellSoft Liberica is a 100% open-source Java 14 implementation",
+    "description": "BellSoft Liberica is a 100% open-source Java 15 implementation",
     "homepage": "https://bell-sw.com/java",
     "version": "15.0.2-10",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
@@ -17,26 +17,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=15&bundle-type=jdk-full&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
-        "jsonpath": "$.version",
-        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-amd64-full.zip"
-            },
-            "32bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-i586-full.zip"
-            }
-        },
-        "hash": {
-            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
-            "jsonpath": "$.sha1"
-        },
-        "extract_dir": "jdk-$matchMajor-full"
     }
 }
diff --git a/bucket/liberica15-jre.json b/bucket/liberica15-jre.json
index 68783d527..48561b87d 100644
--- a/bucket/liberica15-jre.json
+++ b/bucket/liberica15-jre.json
@@ -1,5 +1,5 @@
 {
-    "description": "BellSoft Liberica is a 100% open-source Java 14 implementation",
+    "description": "BellSoft Liberica is a 100% open-source Java 15 implementation",
     "homepage": "https://bell-sw.com/java",
     "version": "15.0.2-10",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
@@ -12,31 +12,5 @@
             "url": "https://github.com/bell-sw/Liberica/releases/download/15.0.2%2B10/bellsoft-jre15.0.2%2B10-windows-i586.zip",
             "hash": "sha1:665435a84aa56df46e704af01e6dd7b63721bfc4"
         }
-    },
-    "extract_dir": "jre-15.0.2",
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=15&bundle-type=jre&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
-        "jsonpath": "$.version",
-        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-amd64.zip"
-            },
-            "32bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-i586.zip"
-            }
-        },
-        "hash": {
-            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
-            "jsonpath": "$.sha1"
-        },
-        "extract_dir": "jre-$matchMajor"
     }
 }
diff --git a/bucket/liberica15-lite.json b/bucket/liberica15-lite.json
index 3b30307da..123cd310a 100644
--- a/bucket/liberica15-lite.json
+++ b/bucket/liberica15-lite.json
@@ -1,5 +1,5 @@
 {
-    "description": "BellSoft Liberica is a 100% open-source Java 14 implementation",
+    "description": "BellSoft Liberica is a 100% open-source Java 15 implementation",
     "homepage": "https://bell-sw.com/java",
     "version": "15.0.2-10",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
@@ -17,26 +17,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=15&bundle-type=jdk-lite&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
-        "jsonpath": "$.version",
-        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-amd64-lite.zip"
-            },
-            "32bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-i586-lite.zip"
-            }
-        },
-        "hash": {
-            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
-            "jsonpath": "$.sha1"
-        },
-        "extract_dir": "jdk-$matchMajor-lite"
     }
 }
diff --git a/bucket/liberica15.json b/bucket/liberica15.json
index 2adea6a6d..ce6633108 100644
--- a/bucket/liberica15.json
+++ b/bucket/liberica15.json
@@ -1,5 +1,5 @@
 {
-    "description": "BellSoft Liberica is a 100% open-source Java 14 implementation",
+    "description": "BellSoft Liberica is a 100% open-source Java 15 implementation",
     "homepage": "https://bell-sw.com/java",
     "version": "15.0.2-10",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
@@ -12,31 +12,5 @@
             "url": "https://github.com/bell-sw/Liberica/releases/download/15.0.2%2B10/bellsoft-jdk15.0.2%2B10-windows-i586.zip",
             "hash": "sha1:dca8ede3b2a1fddacadfc74cd9b77e23436c7f78"
         }
-    },
-    "extract_dir": "jdk-15.0.2",
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=15&bundle-type=jdk&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
-        "jsonpath": "$.version",
-        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-amd64.zip"
-            },
-            "32bit": {
-                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-i586.zip"
-            }
-        },
-        "hash": {
-            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
-            "jsonpath": "$.sha1"
-        },
-        "extract_dir": "jdk-$matchMajor"
     }
 }
diff --git a/bucket/liberica16-full-jdk.json b/bucket/liberica16-full-jdk.json
new file mode 100644
index 000000000..7b18b949a
--- /dev/null
+++ b/bucket/liberica16-full-jdk.json
@@ -0,0 +1,42 @@
+{
+    "description": "BellSoft Liberica is a 100% open-source Java 16 implementation",
+    "homepage": "https://bell-sw.com/java",
+    "version": "16-36",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jdk16%2B36-windows-amd64-full.zip",
+            "hash": "sha1:6cc1f3ead19e4d356210fddb544033d601336857"
+        },
+        "32bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jdk16%2B36-windows-i586-full.zip",
+            "hash": "sha1:5d1df3a64154e173ae06d4f3be6222be85028691"
+        }
+    },
+    "extract_dir": "jdk-16-full",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=16&bundle-type=jdk-full&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
+        "jsonpath": "$.version",
+        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-amd64-full.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-i586-full.zip"
+            }
+        },
+        "hash": {
+            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
+            "jsonpath": "$.sha1"
+        },
+        "extract_dir": "jdk-$matchMajor-full"
+    }
+}
diff --git a/bucket/liberica16-full-jre.json b/bucket/liberica16-full-jre.json
new file mode 100644
index 000000000..098bdd2a4
--- /dev/null
+++ b/bucket/liberica16-full-jre.json
@@ -0,0 +1,42 @@
+{
+    "description": "BellSoft Liberica is a 100% open-source Java 16 implementation",
+    "homepage": "https://bell-sw.com/java",
+    "version": "16-36",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jre16%2B36-windows-amd64-full.zip",
+            "hash": "sha1:f1b46d4495dc2122aac09db23227d9a9888ae15c"
+        },
+        "32bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jre16%2B36-windows-i586-full.zip",
+            "hash": "sha1:005b6ba69ea75f65b3b1b1b97f2ed73bedafcafc"
+        }
+    },
+    "extract_dir": "jre-16-full",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=16&bundle-type=jre-full&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
+        "jsonpath": "$.version",
+        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-amd64-full.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-i586-full.zip"
+            }
+        },
+        "hash": {
+            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
+            "jsonpath": "$.sha1"
+        },
+        "extract_dir": "jre-$matchMajor-full"
+    }
+}
diff --git a/bucket/liberica16-jdk.json b/bucket/liberica16-jdk.json
new file mode 100644
index 000000000..6a907907c
--- /dev/null
+++ b/bucket/liberica16-jdk.json
@@ -0,0 +1,42 @@
+{
+    "description": "BellSoft Liberica is a 100% open-source Java 16 implementation",
+    "homepage": "https://bell-sw.com/java",
+    "version": "16-36",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jdk16%2B36-windows-amd64.zip",
+            "hash": "sha1:cd42d5657c8031852c283b5b20ab63f550744f0e"
+        },
+        "32bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jdk16%2B36-windows-i586.zip",
+            "hash": "sha1:9dd9b57e97a0cff5dbbf7399027b91eccd185e1e"
+        }
+    },
+    "extract_dir": "jdk-16",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=16&bundle-type=jdk&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
+        "jsonpath": "$.version",
+        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-amd64.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-i586.zip"
+            }
+        },
+        "hash": {
+            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
+            "jsonpath": "$.sha1"
+        },
+        "extract_dir": "jdk-$matchMajor"
+    }
+}
diff --git a/bucket/liberica16-jre.json b/bucket/liberica16-jre.json
new file mode 100644
index 000000000..4353dcd92
--- /dev/null
+++ b/bucket/liberica16-jre.json
@@ -0,0 +1,42 @@
+{
+    "description": "BellSoft Liberica is a 100% open-source Java 16 implementation",
+    "homepage": "https://bell-sw.com/java",
+    "version": "16-36",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jre16%2B36-windows-amd64.zip",
+            "hash": "sha1:fa791c3df3281e27201f5dbd501523e4752dd46d"
+        },
+        "32bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jre16%2B36-windows-i586.zip",
+            "hash": "sha1:fa1e3b73772c4723a79d6d4bc6a3f58cddc24005"
+        }
+    },
+    "extract_dir": "jre-16",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=16&bundle-type=jre&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
+        "jsonpath": "$.version",
+        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-amd64.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jre$matchMajor%2B$matchBuild-windows-i586.zip"
+            }
+        },
+        "hash": {
+            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
+            "jsonpath": "$.sha1"
+        },
+        "extract_dir": "jre-$matchMajor"
+    }
+}
diff --git a/bucket/liberica16-lite-jdk.json b/bucket/liberica16-lite-jdk.json
new file mode 100644
index 000000000..5d96f33e1
--- /dev/null
+++ b/bucket/liberica16-lite-jdk.json
@@ -0,0 +1,42 @@
+{
+    "description": "BellSoft Liberica is a 100% open-source Java 16 implementation",
+    "homepage": "https://bell-sw.com/java",
+    "version": "16-36",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jdk16%2B36-windows-amd64-lite.zip",
+            "hash": "sha1:506bed49243788ed6e37564e062e164f777fddfc"
+        },
+        "32bit": {
+            "url": "https://github.com/bell-sw/Liberica/releases/download/16%2B36/bellsoft-jdk16%2B36-windows-i586-lite.zip",
+            "hash": "sha1:586ed0266987e8f06d4ae4835578eb7b0820157a"
+        }
+    },
+    "extract_dir": "jdk-16-lite",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.bell-sw.com/v1/liberica/releases?version-feature=16&bundle-type=jdk-lite&version-modifier=latest&release-type=all&os=windows&arch=x86&installation-type=archive&package-type=zip&output=json&fields=version",
+        "jsonpath": "$.version",
+        "regex": "(?<major>[\\d.]+)(?:\\+)(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-amd64-lite.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/bell-sw/Liberica/releases/download/$matchMajor%2B$matchBuild/bellsoft-jdk$matchMajor%2B$matchBuild-windows-i586-lite.zip"
+            }
+        },
+        "hash": {
+            "url": "https://api.bell-sw.com/v1/liberica/releases/$basename",
+            "jsonpath": "$.sha1"
+        },
+        "extract_dir": "jdk-$matchMajor-lite"
+    }
+}