diff --git a/__tests__/distributors/semeru-installer.test.ts b/__tests__/distributors/semeru-installer.test.ts
index 97f25cc8..868e06d0 100644
--- a/__tests__/distributors/semeru-installer.test.ts
+++ b/__tests__/distributors/semeru-installer.test.ts
@@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
       });
       distribution['getAvailableVersions'] = async () => [];
       await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `Unsupported architecture for IBM Semeru: ${arch}, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
+        `Unsupported architecture: ${arch} is not supported for IBM Semeru 8 for your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
   );
diff --git a/dist/setup/index.js b/dist/setup/index.js
index be40d6db..cfb9dfae 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124931,7 +124931,8 @@ const supportedArchitectures = [
     'ppc64le',
     'ppc64',
     's390x',
-    'aarch64'
+    'aarch64',
+    'arm64'
 ];
 class SemeruDistribution extends base_installer_1.JavaBase {
     constructor(installerOptions) {
@@ -124939,8 +124940,9 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     }
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!supportedArchitectures.includes(this.architecture)) {
-                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, the following are supported: ${supportedArchitectures.join(', ')}`);
+            const arch = this.distributionArchitecture();
+            if (!supportedArchitectures.includes(arch)) {
+                throw new Error(`Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} for your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`);
             }
             if (!this.stable) {
                 throw new Error('IBM Semeru does not provide builds for early access versions');
@@ -124974,7 +124976,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
                 const availableOptionsMessage = availableOptions
                     ? `\nAvailable versions: ${availableOptions}`
                     : '';
-                throw new Error(`Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
@@ -124999,7 +125001,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     getAvailableVersions() {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
-            const arch = this.architecture;
+            const arch = this.distributionArchitecture();
             const imageType = this.packageType;
             const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
             const releaseType = this.stable ? 'ga' : 'ea';
@@ -127946,4 +127948,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
-;
+;
\ No newline at end of file
diff --git a/src/distributions/semeru/installer.ts b/src/distributions/semeru/installer.ts
index c4075261..9beea71e 100644
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@@ -22,7 +22,8 @@ const supportedArchitectures = [
   'ppc64le',
   'ppc64',
   's390x',
-  'aarch64'
+  'aarch64',
+  'arm64'
 ];
 
 export class SemeruDistribution extends JavaBase {
@@ -33,11 +34,11 @@ export class SemeruDistribution extends JavaBase {
   protected async findPackageForDownload(
     version: string
   ): Promise<JavaDownloadRelease> {
-    if (!supportedArchitectures.includes(this.architecture)) {
+    const arch = this.distributionArchitecture();
+
+    if (!supportedArchitectures.includes(arch)) {
       throw new Error(
-        `Unsupported architecture for IBM Semeru: ${
-          this.architecture
-        }, the following are supported: ${supportedArchitectures.join(', ')}`
+        `Unsupported architecture: ${this.architecture} is not supported for IBM Semeru ${this.version} for your current OS version. Please refer to IBM Semeru documentation or support resources to verify compatibility with your OS.`
       );
     }
 
@@ -81,7 +82,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`
       );
     }
 
@@ -124,7 +125,7 @@ export class SemeruDistribution extends JavaBase {
 
   public async getAvailableVersions(): Promise<ISemeruAvailableVersions[]> {
     const platform = this.getPlatformOption();
-    const arch = this.architecture;
+    const arch = this.distributionArchitecture();
     const imageType = this.packageType;
     const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
     const releaseType = this.stable ? 'ga' : 'ea';