diff --git a/__tests__/distributors/zulu-linux-installer.test.ts b/__tests__/distributors/zulu-linux-installer.test.ts
index 23362704..fe9517c4 100644
--- a/__tests__/distributors/zulu-linux-installer.test.ts
+++ b/__tests__/distributors/zulu-linux-installer.test.ts
@@ -49,7 +49,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=linux-glibc&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=linux-glibc&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&page=1&page_size=100'
     ],
     [
       {
@@ -94,7 +94,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=linux-glibc&arch=arm64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=linux-glibc&arch=aarch64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
     ],
     [
       {
@@ -139,7 +139,7 @@ describe('getAvailableVersions', () => {
       distribution['getPlatformOption'] = () => 'linux';
       // Override extension for linux default arch case to match util behavior
       spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'arm64' : distroArch.arch;
+      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'aarch64' : distroArch.arch;
       const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=linux-glibc&arch=${expectedArch}&archive_type=tar.gz&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100`;
 
       await distribution['getAvailableVersions']();
diff --git a/__tests__/distributors/zulu-windows-installer.test.ts b/__tests__/distributors/zulu-windows-installer.test.ts
index 2d51d963..5b600f41 100644
--- a/__tests__/distributors/zulu-windows-installer.test.ts
+++ b/__tests__/distributors/zulu-windows-installer.test.ts
@@ -49,7 +49,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=windows&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=windows&arch=x86&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ea&availability_types=ca&page=1&page_size=100'
     ],
     [
       {
@@ -94,7 +94,7 @@ describe('getAvailableVersions', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      '?os=windows&arch=arm64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
+      '?os=windows&arch=aarch64&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100'
     ],
     [
       {
@@ -137,7 +137,7 @@ describe('getAvailableVersions', () => {
         checkLatest: false
       });
       distribution['getPlatformOption'] = () => 'windows';
-      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'arm64' : distroArch.arch;
+      const expectedArch = distroArch.bitness === '64' && distroArch.arch === 'x86' ? 'x64' : distroArch.bitness === '64' && distroArch.arch === 'arm' ? 'aarch64' : distroArch.arch;
       const buildUrl = `https://api.azul.com/metadata/v1/zulu/packages/?os=windows&arch=${expectedArch}&archive_type=zip&java_package_type=jdk&javafx_bundled=false&crac_supported=false&release_status=ga&availability_types=ca&certifications=tck&page=1&page_size=100`;
 
       await distribution['getAvailableVersions']();
diff --git a/dist/setup/index.js b/dist/setup/index.js
index b088fd1e..fd3487c3 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -114805,7 +114805,9 @@ class ZuluDistribution extends base_installer_1.JavaBase {
                     `crac_supported=${crac}`,
                     `release_status=${releaseStatus}`,
                     `availability_types=ca`,
-                    `certifications=tck`,
+                    // Only filter by TCK certification for GA releases
+                    // EA releases typically don't have TCK certification
+                    releaseStatus === 'ga' ? `certifications=tck` : '',
                     `page=${page}`,
                     `page_size=${pageSize}`
                 ]
@@ -114871,7 +114873,7 @@ class ZuluDistribution extends base_installer_1.JavaBase {
     }
     getArchParam(arch, hw_bitness) {
         // Map architecture to new metadata API arch parameter
-        // The new API uses x64, x86, arm64, arm (not the legacy x86 + hw_bitness pattern)
+        // The new API uses x64, x86, aarch64, arm
         if (arch === 'x86' && hw_bitness === '64') {
             return 'x64';
         }
@@ -114879,7 +114881,7 @@ class ZuluDistribution extends base_installer_1.JavaBase {
             return 'x86';
         }
         else if (arch === 'arm' && hw_bitness === '64') {
-            return 'arm64';
+            return 'aarch64';
         }
         else if (arch === 'arm' && hw_bitness === '') {
             return 'arm';
diff --git a/src/distributions/zulu/installer.ts b/src/distributions/zulu/installer.ts
index 67384549..a5c693c7 100644
--- a/src/distributions/zulu/installer.ts
+++ b/src/distributions/zulu/installer.ts
@@ -133,7 +133,9 @@ export class ZuluDistribution extends JavaBase {
         `crac_supported=${crac}`,
         `release_status=${releaseStatus}`,
         `availability_types=ca`,
-        `certifications=tck`,
+        // Only filter by TCK certification for GA releases
+        // EA releases typically don't have TCK certification
+        releaseStatus === 'ga' ? `certifications=tck` : '',
         `page=${page}`,
         `page_size=${pageSize}`
       ]
@@ -216,13 +218,13 @@ export class ZuluDistribution extends JavaBase {
 
   private getArchParam(arch: string, hw_bitness: string): string {
     // Map architecture to new metadata API arch parameter
-    // The new API uses x64, x86, arm64, arm (not the legacy x86 + hw_bitness pattern)
+    // The new API uses x64, x86, aarch64, arm
     if (arch === 'x86' && hw_bitness === '64') {
       return 'x64';
     } else if (arch === 'x86' && hw_bitness === '32') {
       return 'x86';
     } else if (arch === 'arm' && hw_bitness === '64') {
-      return 'arm64';
+      return 'aarch64';
     } else if (arch === 'arm' && hw_bitness === '') {
       return 'arm';
     }