diff --git a/releases/java.json b/releases/java.json
index fd162a9a..2ca7d005 100644
--- a/releases/java.json
+++ b/releases/java.json
@@ -1,103 +1,103 @@
 {
+  "8u351": "2022-10-18",
   "19.0.1": "2022-10-18",
   "17.0.5": "2022-10-18",
   "11.0.17": "2022-10-18",
-  "8u351": "2022-10-18",
   "19": "2022-09-20",
   "18.0.2.1": "2022-08-18",
   "17.0.4.1": "2022-08-18",
   "11.0.16.1": "2022-08-18",
+  "8u341": "2022-07-19",
+  "7u351": "2022-07-19",
   "18.0.2": "2022-07-19",
   "17.0.4": "2022-07-19",
   "11.0.16": "2022-07-19",
-  "8u341": "2022-07-19",
-  "7u351": "2022-07-19",
+  "8u333": "2022-05-02",
+  "7u343": "2022-05-02",
   "18.0.1.1": "2022-05-02",
   "17.0.3.1": "2022-05-02",
   "11.0.15.1": "2022-05-02",
-  "8u333": "2022-05-02",
-  "7u343": "2022-05-02",
+  "8u331": "2022-04-19",
+  "7u341": "2022-04-19",
   "18.0.1": "2022-04-19",
   "17.0.3": "2022-04-19",
   "11.0.15": "2022-04-19",
-  "8u331": "2022-04-19",
-  "7u341": "2022-04-19",
   "18": "2022-03-22",
-  "17.0.2": "2022-01-18",
-  "11.0.14": "2022-01-18",
   "8u321": "2022-01-18",
   "7u331": "2022-01-18",
-  "17.0.1": "2021-10-19",
-  "11.0.13": "2021-10-19",
+  "17.0.2": "2022-01-18",
+  "11.0.14": "2022-01-18",
   "8u311": "2021-10-19",
   "7u321": "2021-10-19",
+  "17.0.1": "2021-10-19",
+  "11.0.13": "2021-10-19",
   "17": "2021-09-14",
-  "16.0.2": "2021-07-20",
-  "11.0.12": "2021-07-20",
   "8u301": "2021-07-20",
   "7u311": "2021-07-20",
-  "16.0.1": "2021-04-20",
-  "11.0.11": "2021-04-20",
+  "16.0.2": "2021-07-20",
+  "11.0.12": "2021-07-20",
   "8u291": "2021-04-20",
   "7u301": "2021-04-20",
+  "16.0.1": "2021-04-20",
+  "11.0.11": "2021-04-20",
   "16": "2021-03-16",
-  "15.0.2": "2021-01-19",
-  "11.0.10": "2021-01-19",
   "8u281": "2021-01-19",
   "7u291": "2021-01-19",
-  "15.0.1": "2020-10-20",
-  "11.0.9": "2020-10-20",
+  "15.0.2": "2021-01-19",
+  "11.0.10": "2021-01-19",
   "8u271": "2020-10-20",
   "7u281": "2020-10-20",
+  "15.0.1": "2020-10-20",
+  "11.0.9": "2020-10-20",
   "15": "2020-09-15",
-  "14.0.2": "2020-07-14",
-  "11.0.8": "2020-07-14",
   "8u261": "2020-07-14",
   "8u260": "2020-07-14",
   "7u271": "2020-07-14",
-  "14.0.1": "2020-04-14",
-  "11.0.7": "2020-04-14",
+  "14.0.2": "2020-07-14",
+  "11.0.8": "2020-07-14",
   "8u251": "2020-04-14",
   "7u261": "2020-04-14",
+  "14.0.1": "2020-04-14",
+  "11.0.7": "2020-04-14",
   "14": "2020-03-17",
-  "13.0.2": "2020-01-14",
-  "11.0.6": "2020-01-14",
   "8u241": "2020-01-14",
   "7u251": "2020-01-14",
-  "13.0.1": "2019-10-15",
-  "11.0.5": "2019-10-15",
+  "13.0.2": "2020-01-14",
+  "11.0.6": "2020-01-14",
   "8u231": "2019-10-15",
   "7u241": "2019-10-15",
+  "13.0.1": "2019-10-15",
+  "11.0.5": "2019-10-15",
   "13": "2019-09-17",
-  "12.0.2": "2019-07-16",
-  "11.0.4": "2019-07-16",
   "8u221": "2019-07-16",
   "7u231": "2019-07-16",
-  "12.0.1": "2019-04-16",
-  "11.0.3": "2019-04-16",
+  "12.0.2": "2019-07-16",
+  "11.0.4": "2019-07-16",
   "8u212": "2019-04-16",
   "8u211": "2019-04-16",
   "7u221": "2019-04-16",
+  "12.0.1": "2019-04-16",
+  "11.0.3": "2019-04-16",
   "12": "2019-03-19",
-  "11.0.2": "2019-01-15",
   "8u202": "2019-01-15",
   "8u201": "2019-01-15",
   "7u211": "2019-01-15",
-  "11.0.1": "2018-10-16",
+  "11.0.2": "2019-01-15",
   "8u192": "2018-10-16",
   "8u191": "2018-10-16",
   "7u201": "2018-10-16",
   "6u211": "2018-10-16",
+  "11.0.1": "2018-10-16",
   "11": "2018-09-25",
-  "10.0.2": "2018-07-17",
   "8u181": "2018-07-17",
   "7u191": "2018-07-17",
   "6u201": "2018-07-17",
-  "10.0.1": "2018-04-17",
+  "10.0.2": "2018-07-17",
   "8u172": "2018-04-17",
   "8u171": "2018-04-17",
   "7u181": "2018-04-17",
   "6u191": "2018-04-17",
+  "10.0.1": "2018-04-17",
   "10": "2018-03-20",
   "9.0.4": "2018-01-16",
   "8u162": "2018-01-16",
@@ -393,8 +393,8 @@
   "1.3.1_03": "2002-03-28",
   "1.1.8_009": "2002-02-20",
   "1.4.0": "2002-02-13",
-  "1.2.2_011": "2002-01-31",
   "1.2.2_11": "2002-01-31",
+  "1.2.2_011": "2002-01-31",
   "1.3.1_02": "2001-12-20",
   "1.3.0_05": "2001-11-29",
   "1.2.2_10": "2001-11-01",
@@ -402,8 +402,8 @@
   "1.3.1_01a": "2001-10-19",
   "1.3.1_01": "2001-09-04",
   "1.3.0_04": "2001-08-30",
-  "1.2.2_009": "2001-07-26",
   "1.2.2_09": "2001-07-26",
+  "1.2.2_009": "2001-07-26",
   "1.1.8_008": "2001-06-28",
   "1.3.1": "2001-05-17",
   "1.2.2_08": "2001-05-03",
@@ -421,12 +421,12 @@
   "1.1.8_11": "2000-08-18",
   "1.1.8_005": "2000-08-18",
   "1.1.6_008": "2000-07-17",
-  "1.2.2_006": "2000-07-12",
   "1.2.2_06": "2000-07-12",
+  "1.2.2_006": "2000-07-12",
   "1.1.8_004": "2000-05-18",
   "1.3.0": "2000-05-08",
-  "1.2.2_005": "2000-05-05",
   "1.2.2_05": "2000-05-05",
+  "1.2.2_005": "2000-05-05",
   "1.2.2_05a": "2000-04-17",
   "1.2.2_004": "2000-03-20",
   "1.1.8_003": "2000-03-17",
diff --git a/src/java.py b/src/java.py
index a58bb9a0..55828c9a 100644
--- a/src/java.py
+++ b/src/java.py
@@ -45,10 +45,10 @@ def main():
     print("::endgroup::")
 
     with open(f"releases/{PRODUCT}.json", "w") as f:
-        f.write(json.dumps(
-            # sort by date desc
-            dict(sorted(releases.items(), key=lambda e: e[1], reverse=True)),
-            indent=2))
+        f.write(json.dumps(dict(
+            # sort by date then version (desc)
+            sorted(releases.items(), key=lambda x: (x[1], x[0]), reverse=True)
+        ), indent=2))
 
 
 if __name__ == '__main__':