diff --git a/assets/data/sapmachine-releases-24.json b/assets/data/sapmachine-releases-24.json
index 19236e705d1..8266cb7a33a 100644
--- a/assets/data/sapmachine-releases-24.json
+++ b/assets/data/sapmachine-releases-24.json
@@ -14,6 +14,13 @@
                 "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_aix-ppc64_bin.tar.gz"
               }
             },
+            "linux-aarch64": {
+              "tar.gz": {
+                "name": "sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz",
+                "checksum": "4fc4ea181ef9fb3a27c122353f60f353ad71378046a535db08db318a8e1de4bd",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz"
+              }
+            },
             "linux-ppc64le": {
               "tar.gz": {
                 "name": "sapmachine-jdk-24-ea.16_linux-ppc64le_bin.tar.gz",
@@ -56,6 +63,13 @@
                 "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_aix-ppc64_bin.tar.gz"
               }
             },
+            "linux-aarch64": {
+              "tar.gz": {
+                "name": "sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz",
+                "checksum": "a6ce77f47c7297d968a631f43d78348e2f519b45ef3b2431666b51913f609263",
+                "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz"
+              }
+            },
             "linux-ppc64le": {
               "tar.gz": {
                 "name": "sapmachine-jre-24-ea.16_linux-ppc64le_bin.tar.gz",
diff --git a/assets/data/sapmachine-releases-all.json b/assets/data/sapmachine-releases-all.json
index c48039995a4..781b3b50eb0 100644
--- a/assets/data/sapmachine-releases-all.json
+++ b/assets/data/sapmachine-releases-all.json
@@ -15,6 +15,13 @@
                   "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_aix-ppc64_bin.tar.gz"
                 }
               },
+              "linux-aarch64": {
+                "tar.gz": {
+                  "name": "sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz",
+                  "checksum": "4fc4ea181ef9fb3a27c122353f60f353ad71378046a535db08db318a8e1de4bd",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz"
+                }
+              },
               "linux-ppc64le": {
                 "tar.gz": {
                   "name": "sapmachine-jdk-24-ea.16_linux-ppc64le_bin.tar.gz",
@@ -57,6 +64,13 @@
                   "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_aix-ppc64_bin.tar.gz"
                 }
               },
+              "linux-aarch64": {
+                "tar.gz": {
+                  "name": "sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz",
+                  "checksum": "a6ce77f47c7297d968a631f43d78348e2f519b45ef3b2431666b51913f609263",
+                  "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz"
+                }
+              },
               "linux-ppc64le": {
                 "tar.gz": {
                   "name": "sapmachine-jre-24-ea.16_linux-ppc64le_bin.tar.gz",
diff --git a/assets/data/sapmachine-releases-latest.json b/assets/data/sapmachine-releases-latest.json
index b5cbed55366..3c5846883a7 100644
--- a/assets/data/sapmachine-releases-latest.json
+++ b/assets/data/sapmachine-releases-latest.json
@@ -11,6 +11,10 @@
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_aix-ppc64_bin.tar.gz",
             "checksum": "sha256 647ab7b6af17949be9103057c90470e38e0fb1b7dabd0e4b39681ffed613bea8"
           },
+          "linux-aarch64": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz",
+            "checksum": "sha256 4fc4ea181ef9fb3a27c122353f60f353ad71378046a535db08db318a8e1de4bd"
+          },
           "linux-ppc64le": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-ppc64le_bin.tar.gz",
             "checksum": "sha256 c73201cf346cc2bba3746804134fc433e419eb1839208568b16a48bb676ca41c"
@@ -37,6 +41,10 @@
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_aix-ppc64_bin.tar.gz",
             "checksum": "sha256 bf941f1a451547c356b77a2963353f80865b1c3a32254dd3d6f8e11bffbb727f"
           },
+          "linux-aarch64": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz",
+            "checksum": "sha256 a6ce77f47c7297d968a631f43d78348e2f519b45ef3b2431666b51913f609263"
+          },
           "linux-ppc64le": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-ppc64le_bin.tar.gz",
             "checksum": "sha256 2409e1992b2d041db34885454f2dfbb458e938042172e24070e6f90ecdac0358"
@@ -62,10 +70,6 @@
       {
         "tag": "sapmachine-24+15",
         "jdk": {
-          "linux-aarch64": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_linux-aarch64_bin.tar.gz",
-            "checksum": "sha256 4cb3590dcd25e04900c7fc6dc6457e49c8040b849ad047fe29237bf412a3710c"
-          },
           "macos-aarch64-installer": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_macos-aarch64_bin.dmg",
             "checksum": "sha256 e044754e21811b180d58987804b6e8814217d3b022ce453a43d2f1e759992ef9"
@@ -80,10 +84,6 @@
           }
         },
         "jre": {
-          "linux-aarch64": {
-            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_linux-aarch64_bin.tar.gz",
-            "checksum": "sha256 a18f877605b2499041168651e1e2397467154f7d1205d18fed0c4ffd86fe0a99"
-          },
           "macos-aarch64-installer": {
             "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_macos-aarch64_bin.dmg",
             "checksum": "sha256 45862adf399fd52bb5ef99f96e95921aea4aeb50b5950dc031a89d962b7cfa6b"
diff --git a/assets/data/sapmachine-releases-website.json b/assets/data/sapmachine-releases-website.json
index 2aaa61f797a..2721aaf8430 100644
--- a/assets/data/sapmachine-releases-website.json
+++ b/assets/data/sapmachine-releases-website.json
@@ -86,6 +86,7 @@
           "tag": "sapmachine-24+16",
           "jdk": {
             "aix-ppc64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_aix-ppc64_bin.tar.gz",
+            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz",
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-x64-musl_bin.tar.gz",
@@ -94,6 +95,7 @@
           },
           "jre": {
             "aix-ppc64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_aix-ppc64_bin.tar.gz",
+            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz",
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-x64-musl_bin.tar.gz",
@@ -104,13 +106,11 @@
         {
           "tag": "sapmachine-24+15",
           "jdk": {
-            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_linux-aarch64_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_macos-aarch64_bin.dmg",
             "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_windows-x64_bin.zip"
           },
           "jre": {
-            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_linux-aarch64_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_macos-aarch64_bin.dmg",
             "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_windows-x64_bin.zip"
diff --git a/assets/data/sapmachine_releases.json b/assets/data/sapmachine_releases.json
index f1bc819a4c8..ae4b2c7dbe2 100644
--- a/assets/data/sapmachine_releases.json
+++ b/assets/data/sapmachine_releases.json
@@ -86,6 +86,7 @@
           "tag": "sapmachine-24+16",
           "jdk": {
             "aix-ppc64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_aix-ppc64_bin.tar.gz",
+            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-aarch64_bin.tar.gz",
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jdk-24-ea.16_linux-x64-musl_bin.tar.gz",
@@ -94,6 +95,7 @@
           },
           "jre": {
             "aix-ppc64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_aix-ppc64_bin.tar.gz",
+            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-aarch64_bin.tar.gz",
             "linux-ppc64le": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-ppc64le_bin.tar.gz",
             "linux-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-x64_bin.tar.gz",
             "linux-x64-musl": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B16/sapmachine-jre-24-ea.16_linux-x64-musl_bin.tar.gz",
@@ -104,13 +106,11 @@
         {
           "tag": "sapmachine-24+15",
           "jdk": {
-            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_linux-aarch64_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_macos-aarch64_bin.dmg",
             "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jdk-24-ea.15_windows-x64_bin.zip"
           },
           "jre": {
-            "linux-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_linux-aarch64_bin.tar.gz",
             "macos-aarch64-installer": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_macos-aarch64_bin.dmg",
             "macos-aarch64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_macos-aarch64_bin.tar.gz",
             "windows-x64": "https://github.com/SAP/SapMachine/releases/download/sapmachine-24%2B15/sapmachine-jre-24-ea.15_windows-x64_bin.zip"
@@ -122,6 +122,7 @@
           "tag": "sapmachine-24+16",
           "jdk": {
             "aix-ppc64": "sha256 647ab7b6af17949be9103057c90470e38e0fb1b7dabd0e4b39681ffed613bea8",
+            "linux-aarch64": "sha256 4fc4ea181ef9fb3a27c122353f60f353ad71378046a535db08db318a8e1de4bd",
             "linux-ppc64le": "sha256 c73201cf346cc2bba3746804134fc433e419eb1839208568b16a48bb676ca41c",
             "linux-x64": "sha256 ef9a892a8738c2d9c8c473dc6e3c063bdf1266b3ac03b59051c349c25dac4a27",
             "linux-x64-musl": "sha256 b18c6a0e4e672f0a7bb05e8381fd83b110f93dea24f9e5e7d7a6969485eac5e5",
@@ -130,6 +131,7 @@
           },
           "jre": {
             "aix-ppc64": "sha256 bf941f1a451547c356b77a2963353f80865b1c3a32254dd3d6f8e11bffbb727f",
+            "linux-aarch64": "sha256 a6ce77f47c7297d968a631f43d78348e2f519b45ef3b2431666b51913f609263",
             "linux-ppc64le": "sha256 2409e1992b2d041db34885454f2dfbb458e938042172e24070e6f90ecdac0358",
             "linux-x64": "sha256 85c001a70db238e56a44ea3f1afce2d52ae0190478a83b6573a599dbe91b9230",
             "linux-x64-musl": "sha256 69df50e9f450feb5d9ae9bb237489e6ed366a94a817f0dadf03346be05a86576",
@@ -140,13 +142,11 @@
         {
           "tag": "sapmachine-24+15",
           "jdk": {
-            "linux-aarch64": "sha256 4cb3590dcd25e04900c7fc6dc6457e49c8040b849ad047fe29237bf412a3710c",
             "macos-aarch64-installer": "sha256 e044754e21811b180d58987804b6e8814217d3b022ce453a43d2f1e759992ef9",
             "macos-aarch64": "sha256 425995c415543aae0d58021ce545fd0279f2d17beaac3fcf6f4f431f56a37774",
             "windows-x64": "sha256 d15221e1c71fa44bf828cbf0c48a435c29c6a95d2096a2c265694fea52af79b3"
           },
           "jre": {
-            "linux-aarch64": "sha256 a18f877605b2499041168651e1e2397467154f7d1205d18fed0c4ffd86fe0a99",
             "macos-aarch64-installer": "sha256 45862adf399fd52bb5ef99f96e95921aea4aeb50b5950dc031a89d962b7cfa6b",
             "macos-aarch64": "sha256 2b44bb04602604461eef86da8964e36a7b47016e7462c3f85f17931baa0869c9",
             "windows-x64": "sha256 0790b28d5903249b3cd93a181fb5b17c21dcf5609126b46ac0b480793f88d784"