diff --git a/assets/data/sapmachine-releases-17.json b/assets/data/sapmachine-releases-17.json
index 3637c9d26da..2014f718cbf 100644
--- a/assets/data/sapmachine-releases-17.json
+++ b/assets/data/sapmachine-releases-17.json
@@ -34,6 +34,18 @@
                 "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64-musl_bin.tar.gz"
               }
             },
+            "macos-aarch64": {
+              "dmg": {
+                "name": "sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                "checksum": "8938c2b9ad42722832f06732be7f59abab26a33f631820ab804049980925ffa9"
+              },
+              "tar.gz": {
+                "name": "sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
+                "checksum": "7d407179207d7b4fdfc189f6798045170dafcaf2570587a588e698d04d19296d",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz"
+              }
+            },
             "windows-x64": {
               "zip": {
                 "name": "sapmachine-jdk-17.0.11-ea.7_windows-x64_bin.zip",
@@ -71,6 +83,18 @@
                 "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64-musl_bin.tar.gz"
               }
             },
+            "macos-aarch64": {
+              "dmg": {
+                "name": "sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                "checksum": "23dda4a224308b41fc959df3cc611ea12b097a7d120444de6fe2b9f8d3b9efd4"
+              },
+              "tar.gz": {
+                "name": "sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
+                "checksum": "2428357df157e5c4fb74a4b32aaf5039e0b222bcd23ec1faba07ebd76e65eb78",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz"
+              }
+            },
             "windows-x64": {
               "zip": {
                 "name": "sapmachine-jre-17.0.11-ea.7_windows-x64_bin.zip",
diff --git a/assets/data/sapmachine-releases-all.json b/assets/data/sapmachine-releases-all.json
index 00701f5ce19..dfad0a10afa 100644
--- a/assets/data/sapmachine-releases-all.json
+++ b/assets/data/sapmachine-releases-all.json
@@ -30491,6 +30491,18 @@
                   "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64-musl_bin.tar.gz"
                 }
               },
+              "macos-aarch64": {
+                "dmg": {
+                  "name": "sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                  "checksum": "8938c2b9ad42722832f06732be7f59abab26a33f631820ab804049980925ffa9"
+                },
+                "tar.gz": {
+                  "name": "sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
+                  "checksum": "7d407179207d7b4fdfc189f6798045170dafcaf2570587a588e698d04d19296d",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz"
+                }
+              },
               "windows-x64": {
                 "zip": {
                   "name": "sapmachine-jdk-17.0.11-ea.7_windows-x64_bin.zip",
@@ -30528,6 +30540,18 @@
                   "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64-musl_bin.tar.gz"
                 }
               },
+              "macos-aarch64": {
+                "dmg": {
+                  "name": "sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+                  "checksum": "23dda4a224308b41fc959df3cc611ea12b097a7d120444de6fe2b9f8d3b9efd4"
+                },
+                "tar.gz": {
+                  "name": "sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
+                  "checksum": "2428357df157e5c4fb74a4b32aaf5039e0b222bcd23ec1faba07ebd76e65eb78",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz"
+                }
+              },
               "windows-x64": {
                 "zip": {
                   "name": "sapmachine-jre-17.0.11-ea.7_windows-x64_bin.zip",
diff --git a/assets/data/sapmachine-releases-latest.json b/assets/data/sapmachine-releases-latest.json
index 59f15abd3bb..1eaff4b5d68 100644
--- a/assets/data/sapmachine-releases-latest.json
+++ b/assets/data/sapmachine-releases-latest.json
@@ -501,6 +501,14 @@
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64-musl_bin.tar.gz",
             "checksum": "sha256 ec24eaa6bfcf12062e0ddaf41d2bb7bc14c1e9a228e1d33bd5b5d5a63646ecdf"
           },
+          "macos-aarch64-installer": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+            "checksum": "sha256 8938c2b9ad42722832f06732be7f59abab26a33f631820ab804049980925ffa9"
+          },
+          "macos-aarch64": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
+            "checksum": "sha256 7d407179207d7b4fdfc189f6798045170dafcaf2570587a588e698d04d19296d"
+          },
           "windows-x64": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_windows-x64_bin.zip",
             "checksum": "sha256 086ed5d0378c115d63cfd31cbab1fe49038e6deba639012df0463eeb8ce0009d"
@@ -523,6 +531,14 @@
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64-musl_bin.tar.gz",
             "checksum": "sha256 292c6dc6cfe3f6502967308d20b55f894dae6a5826a7a6130c7bf9059f08bd6f"
           },
+          "macos-aarch64-installer": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+            "checksum": "sha256 23dda4a224308b41fc959df3cc611ea12b097a7d120444de6fe2b9f8d3b9efd4"
+          },
+          "macos-aarch64": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
+            "checksum": "sha256 2428357df157e5c4fb74a4b32aaf5039e0b222bcd23ec1faba07ebd76e65eb78"
+          },
           "windows-x64": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_windows-x64_bin.zip",
             "checksum": "sha256 14fed07a2df0737aa6c29d56b41c17fd6f427576c7250eb2603b1ad6dc5b3ff5"
@@ -532,14 +548,6 @@
       {
         "tag": "sapmachine-17.0.11+6",
         "jdk": {
-          "macos-aarch64-installer": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-aarch64_bin.dmg",
-            "checksum": "sha256 513519eb12958e763df021b7af28699a6076749ba748aaa600eb2a26ad05769d"
-          },
-          "macos-aarch64": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-aarch64_bin.tar.gz",
-            "checksum": "sha256 1d32113ae39c184c8480d64f90c2341b9ab805c78d8a391edebdb34ef41ff02f"
-          },
           "macos-x64-installer": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-x64_bin.dmg",
             "checksum": "sha256 c21de53b81068b478dcf8489de99269cf5c13dbc11ed8d0f6d08289e32c7250d"
@@ -550,14 +558,6 @@
           }
         },
         "jre": {
-          "macos-aarch64-installer": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-aarch64_bin.dmg",
-            "checksum": "sha256 5858dec191d707d3f2cd050b75b0b165c0a6291f7e0d4c93f1ae0ac5f8cdc5d7"
-          },
-          "macos-aarch64": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-aarch64_bin.tar.gz",
-            "checksum": "sha256 426579184edc5841eeaa919a7c62b1b3811de92e7fffd3a52cae2e3273bf8b45"
-          },
           "macos-x64-installer": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-x64_bin.dmg",
             "checksum": "sha256 6822bb7971a9c7ffa92bcd05701fc8cd5d4ef7509d8d28b34f81c7bb0c9b4f19"
diff --git a/assets/data/sapmachine-releases-website.json b/assets/data/sapmachine-releases-website.json
index 294d9491d4c..b4d0c7b2120 100644
--- a/assets/data/sapmachine-releases-website.json
+++ b/assets/data/sapmachine-releases-website.json
@@ -234,6 +234,8 @@
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64-musl_bin.tar.gz",
+            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_windows-x64_bin.zip"
           },
           "jre": {
@@ -241,20 +243,18 @@
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64-musl_bin.tar.gz",
+            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_windows-x64_bin.zip"
           }
         },
         {
           "tag": "sapmachine-17.0.11+6",
           "jdk": {
-            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-aarch64_bin.tar.gz",
             "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-x64_bin.dmg",
             "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-x64_bin.tar.gz"
           },
           "jre": {
-            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-aarch64_bin.tar.gz",
             "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-x64_bin.dmg",
             "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-x64_bin.tar.gz"
           }
diff --git a/assets/data/sapmachine_releases.json b/assets/data/sapmachine_releases.json
index 1b523a12e9d..5478431a024 100644
--- a/assets/data/sapmachine_releases.json
+++ b/assets/data/sapmachine_releases.json
@@ -381,6 +381,8 @@
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_linux-x64-musl_bin.tar.gz",
+            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.dmg",
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jdk-17.0.11-ea.7_windows-x64_bin.zip"
           },
           "jre": {
@@ -388,20 +390,18 @@
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_linux-x64-musl_bin.tar.gz",
+            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.dmg",
+            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B7/sapmachine-jre-17.0.11-ea.7_windows-x64_bin.zip"
           }
         },
         {
           "tag": "sapmachine-17.0.11+6",
           "jdk": {
-            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-aarch64_bin.tar.gz",
             "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-x64_bin.dmg",
             "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jdk-17.0.11-ea.6_macos-x64_bin.tar.gz"
           },
           "jre": {
-            "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-aarch64_bin.dmg",
-            "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-aarch64_bin.tar.gz",
             "macos-x64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-x64_bin.dmg",
             "macos-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.11%2B6/sapmachine-jre-17.0.11-ea.6_macos-x64_bin.tar.gz"
           }
@@ -433,6 +433,8 @@
             "linux-ppc64le": "sha256 1e6f118092edb60bec6065a23b54b136f94d6bfac50353a5f0ef364b4fa720f4",
             "linux-x64": "sha256 af735b5e68f526e37bb38a4ea6055b3f23fd406fc3e64cd74c0e54e24c313e79",
             "linux-x64-musl": "sha256 ec24eaa6bfcf12062e0ddaf41d2bb7bc14c1e9a228e1d33bd5b5d5a63646ecdf",
+            "macos-aarch64-installer": "sha256 8938c2b9ad42722832f06732be7f59abab26a33f631820ab804049980925ffa9",
+            "macos-aarch64": "sha256 7d407179207d7b4fdfc189f6798045170dafcaf2570587a588e698d04d19296d",
             "windows-x64": "sha256 086ed5d0378c115d63cfd31cbab1fe49038e6deba639012df0463eeb8ce0009d"
           },
           "jre": {
@@ -440,20 +442,18 @@
             "linux-ppc64le": "sha256 2a9b6f3e5afaf4ccfbb1d11a59cdaa838f6fef29d50a86ce50c8a26775d9293a",
             "linux-x64": "sha256 a2cd11a26f8144d3529a16b8ce43a12db3e3992cb47b2057456ef847ac86a27d",
             "linux-x64-musl": "sha256 292c6dc6cfe3f6502967308d20b55f894dae6a5826a7a6130c7bf9059f08bd6f",
+            "macos-aarch64-installer": "sha256 23dda4a224308b41fc959df3cc611ea12b097a7d120444de6fe2b9f8d3b9efd4",
+            "macos-aarch64": "sha256 2428357df157e5c4fb74a4b32aaf5039e0b222bcd23ec1faba07ebd76e65eb78",
             "windows-x64": "sha256 14fed07a2df0737aa6c29d56b41c17fd6f427576c7250eb2603b1ad6dc5b3ff5"
           }
         },
         {
           "tag": "sapmachine-17.0.11+6",
           "jdk": {
-            "macos-aarch64-installer": "sha256 513519eb12958e763df021b7af28699a6076749ba748aaa600eb2a26ad05769d",
-            "macos-aarch64": "sha256 1d32113ae39c184c8480d64f90c2341b9ab805c78d8a391edebdb34ef41ff02f",
             "macos-x64-installer": "sha256 c21de53b81068b478dcf8489de99269cf5c13dbc11ed8d0f6d08289e32c7250d",
             "macos-x64": "sha256 d167da1ce391741655b74a956f0e9d777758432435d14a2a881dbda4d8cb1888"
           },
           "jre": {
-            "macos-aarch64-installer": "sha256 5858dec191d707d3f2cd050b75b0b165c0a6291f7e0d4c93f1ae0ac5f8cdc5d7",
-            "macos-aarch64": "sha256 426579184edc5841eeaa919a7c62b1b3811de92e7fffd3a52cae2e3273bf8b45",
             "macos-x64-installer": "sha256 6822bb7971a9c7ffa92bcd05701fc8cd5d4ef7509d8d28b34f81c7bb0c9b4f19",
             "macos-x64": "sha256 49407448f7d68b82d0df384bdb6f040e905ae14eb855687deee93ff20676c88d"
           }