diff --git a/assets/data/sapmachine-releases-24.json b/assets/data/sapmachine-releases-24.json
index 5fbe045b4b0..d024001cc4a 100644
--- a/assets/data/sapmachine-releases-24.json
+++ b/assets/data/sapmachine-releases-24.json
@@ -53,6 +53,18 @@
                 "checksum": "1b9e84fc70628de3bab46c5a391e12473bd8e0e868922f7bc563decc413865ce",
                 "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz"
               }
+            },
+            "macos-x64": {
+              "dmg": {
+                "name": "sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+                "checksum": "90b131c76bcf702b0ac2fa091d2b7ec33e814634a4899fd5a208637aa29be619"
+              },
+              "tar.gz": {
+                "name": "sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz",
+                "checksum": "a0c5a423f688eae64e365c1e9c8256ed5c609d1eb9fdd2cec6da6212cbf98fde",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz"
+              }
             }
           },
           "jre": {
@@ -102,6 +114,18 @@
                 "checksum": "2779d37f94038c2ba3bdf60a907afc3eaa2057450b05c82dc498665c1fcb5625",
                 "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz"
               }
+            },
+            "macos-x64": {
+              "dmg": {
+                "name": "sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+                "checksum": "e26102ecee2fc59dd9ceb854e6dbf1453b319d3dccb99e994a27a9c3a61e6ffb"
+              },
+              "tar.gz": {
+                "name": "sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz",
+                "checksum": "c2d329eb809b91fddb33a99c5720b9c4d16075b1992ae3ca9b170bbbc4450e2a",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz"
+              }
             }
           }
         }
diff --git a/assets/data/sapmachine-releases-all.json b/assets/data/sapmachine-releases-all.json
index dab9e6e51f0..783bbb7d55a 100644
--- a/assets/data/sapmachine-releases-all.json
+++ b/assets/data/sapmachine-releases-all.json
@@ -54,6 +54,18 @@
                   "checksum": "1b9e84fc70628de3bab46c5a391e12473bd8e0e868922f7bc563decc413865ce",
                   "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz"
                 }
+              },
+              "macos-x64": {
+                "dmg": {
+                  "name": "sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+                  "checksum": "90b131c76bcf702b0ac2fa091d2b7ec33e814634a4899fd5a208637aa29be619"
+                },
+                "tar.gz": {
+                  "name": "sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz",
+                  "checksum": "a0c5a423f688eae64e365c1e9c8256ed5c609d1eb9fdd2cec6da6212cbf98fde",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz"
+                }
               }
             },
             "jre": {
@@ -103,6 +115,18 @@
                   "checksum": "2779d37f94038c2ba3bdf60a907afc3eaa2057450b05c82dc498665c1fcb5625",
                   "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz"
                 }
+              },
+              "macos-x64": {
+                "dmg": {
+                  "name": "sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+                  "checksum": "e26102ecee2fc59dd9ceb854e6dbf1453b319d3dccb99e994a27a9c3a61e6ffb"
+                },
+                "tar.gz": {
+                  "name": "sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz",
+                  "checksum": "c2d329eb809b91fddb33a99c5720b9c4d16075b1992ae3ca9b170bbbc4450e2a",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz"
+                }
               }
             }
           }
diff --git a/assets/data/sapmachine-releases-latest.json b/assets/data/sapmachine-releases-latest.json
index 9001ab49840..c53c0909759 100644
--- a/assets/data/sapmachine-releases-latest.json
+++ b/assets/data/sapmachine-releases-latest.json
@@ -34,6 +34,14 @@
           "macos-aarch64": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz",
             "checksum": "sha256 1b9e84fc70628de3bab46c5a391e12473bd8e0e868922f7bc563decc413865ce"
+          },
+          "macos-x64-installer": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+            "checksum": "sha256 90b131c76bcf702b0ac2fa091d2b7ec33e814634a4899fd5a208637aa29be619"
+          },
+          "macos-x64": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz",
+            "checksum": "sha256 a0c5a423f688eae64e365c1e9c8256ed5c609d1eb9fdd2cec6da6212cbf98fde"
           }
         },
         "jre": {
@@ -64,34 +72,26 @@
           "macos-aarch64": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz",
             "checksum": "sha256 2779d37f94038c2ba3bdf60a907afc3eaa2057450b05c82dc498665c1fcb5625"
+          },
+          "macos-x64-installer": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+            "checksum": "sha256 e26102ecee2fc59dd9ceb854e6dbf1453b319d3dccb99e994a27a9c3a61e6ffb"
+          },
+          "macos-x64": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz",
+            "checksum": "sha256 c2d329eb809b91fddb33a99c5720b9c4d16075b1992ae3ca9b170bbbc4450e2a"
           }
         }
       },
       {
         "tag": "sapmachine-24+16",
         "jdk": {
-          "macos-x64-installer": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_macos-x64_bin.dmg",
-            "checksum": "sha256 b839eaddb5cd349a89b8859a4070bd535506bb699202a50e6ec0f34249976f2b"
-          },
-          "macos-x64": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_macos-x64_bin.tar.gz",
-            "checksum": "sha256 54a3169ae7c25606be99897640b4a62ec1848de9e12aed87ad7ef0e2dc8eaedc"
-          },
           "windows-x64": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_windows-x64_bin.zip",
             "checksum": "sha256 e757b05de0c7288b93d0b97200289cb4d3740db929ed8e6fc6591733e12f14e9"
           }
         },
         "jre": {
-          "macos-x64-installer": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_macos-x64_bin.dmg",
-            "checksum": "sha256 304ba15a31078a802778437fb4b6ce9bfdfeccf09c89a0de2076fd3a5b9c1656"
-          },
-          "macos-x64": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_macos-x64_bin.tar.gz",
-            "checksum": "sha256 87a5fab72afb4933d94ae18027ee6786d7d94ebd8f7e267247ccfc334cb11fda"
-          },
           "windows-x64": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_windows-x64_bin.zip",
             "checksum": "sha256 aa1034dd16d249917300439d4262abaff68a8f69d21e5628990dca829c9d47be"
diff --git a/assets/data/sapmachine-releases-website.json b/assets/data/sapmachine-releases-website.json
index 16513b37b4d..ea3c205711e 100644
--- a/assets/data/sapmachine-releases-website.json
+++ b/assets/data/sapmachine-releases-website.json
@@ -91,7 +91,9 @@
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_linux-x64-musl_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz"
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz",
+            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz"
           },
           "jre": {
             "aix-ppc64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_aix-ppc64_bin.tar.gz",
@@ -100,19 +102,17 @@
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_linux-x64-musl_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz"
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz",
+            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz"
           }
         },
         {
           "tag": "sapmachine-24+16",
           "jdk": {
-            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_macos-x64_bin.dmg",
-            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_macos-x64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_windows-x64_bin.zip"
           },
           "jre": {
-            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_macos-x64_bin.dmg",
-            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_macos-x64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_windows-x64_bin.zip"
           }
         }
diff --git a/assets/data/sapmachine_releases.json b/assets/data/sapmachine_releases.json
index 99531d205df..2299859fe67 100644
--- a/assets/data/sapmachine_releases.json
+++ b/assets/data/sapmachine_releases.json
@@ -91,7 +91,9 @@
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_linux-x64-musl_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz"
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-aarch64_bin.tar.gz",
+            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.dmg",
+            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jdk-24-ea.17_macos-x64_bin.tar.gz"
           },
           "jre": {
             "aix-ppc64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_aix-ppc64_bin.tar.gz",
@@ -100,19 +102,17 @@
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_linux-x64-musl_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz"
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-aarch64_bin.tar.gz",
+            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.dmg",
+            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B17/sapmachine-jre-24-ea.17_macos-x64_bin.tar.gz"
           }
         },
         {
           "tag": "sapmachine-24+16",
           "jdk": {
-            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_macos-x64_bin.dmg",
-            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_macos-x64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_windows-x64_bin.zip"
           },
           "jre": {
-            "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_macos-x64_bin.dmg",
-            "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_macos-x64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_windows-x64_bin.zip"
           }
         }
@@ -127,7 +127,9 @@
             "linux-x64": "sha256 14f8c029f1e5b9bd94ee6f7ba29c74709c7418ead2899232f42c061ab452631a",
             "linux-x64-musl": "sha256 240a180b75bdb3047b1dd32111f7b625e3db7879620ef49c2855606c334e5381",
             "macos-aarch64-installer": "sha256 da31cadeaf2fd05b018f9c8358c324ee3ae8a455e08bc04749d1309e7d551f84",
-            "macos-aarch64": "sha256 1b9e84fc70628de3bab46c5a391e12473bd8e0e868922f7bc563decc413865ce"
+            "macos-aarch64": "sha256 1b9e84fc70628de3bab46c5a391e12473bd8e0e868922f7bc563decc413865ce",
+            "macos-x64-installer": "sha256 90b131c76bcf702b0ac2fa091d2b7ec33e814634a4899fd5a208637aa29be619",
+            "macos-x64": "sha256 a0c5a423f688eae64e365c1e9c8256ed5c609d1eb9fdd2cec6da6212cbf98fde"
           },
           "jre": {
             "aix-ppc64": "sha256 fe3de8ab4fb4c198669b4143b14c7b22e988aa12dcc387b9f07eb537987213b1",
@@ -136,19 +138,17 @@
             "linux-x64": "sha256 09ae4fd3a6e83ca26e829d6e7712dd3404f49e077e79fc1449a339c31a00ebbd",
             "linux-x64-musl": "sha256 3101fb67d442c2e30b320c83b72009d4f36d4e9d8df9621d59db874fc38d0ee6",
             "macos-aarch64-installer": "sha256 fd115088a806ce3a35458a7610dfc584d87546af1ed2f6f681f32dc8830e21e9",
-            "macos-aarch64": "sha256 2779d37f94038c2ba3bdf60a907afc3eaa2057450b05c82dc498665c1fcb5625"
+            "macos-aarch64": "sha256 2779d37f94038c2ba3bdf60a907afc3eaa2057450b05c82dc498665c1fcb5625",
+            "macos-x64-installer": "sha256 e26102ecee2fc59dd9ceb854e6dbf1453b319d3dccb99e994a27a9c3a61e6ffb",
+            "macos-x64": "sha256 c2d329eb809b91fddb33a99c5720b9c4d16075b1992ae3ca9b170bbbc4450e2a"
           }
         },
         {
           "tag": "sapmachine-24+16",
           "jdk": {
-            "macos-x64-installer": "sha256 b839eaddb5cd349a89b8859a4070bd535506bb699202a50e6ec0f34249976f2b",
-            "macos-x64": "sha256 54a3169ae7c25606be99897640b4a62ec1848de9e12aed87ad7ef0e2dc8eaedc",
             "windows-x64": "sha256 e757b05de0c7288b93d0b97200289cb4d3740db929ed8e6fc6591733e12f14e9"
           },
           "jre": {
-            "macos-x64-installer": "sha256 304ba15a31078a802778437fb4b6ce9bfdfeccf09c89a0de2076fd3a5b9c1656",
-            "macos-x64": "sha256 87a5fab72afb4933d94ae18027ee6786d7d94ebd8f7e267247ccfc334cb11fda",
             "windows-x64": "sha256 aa1034dd16d249917300439d4262abaff68a8f69d21e5628990dca829c9d47be"
           }
         }