diff --git a/lib/utils.js b/lib/utils.js
index c9673c73c..a953fbcc6 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -336,6 +336,9 @@ class Utils {
         if ((0, os_1.arch)().includes('arm')) {
             return (0, os_1.arch)().includes('64') ? 'linux-arm64' : 'linux-arm';
         }
+        if ((0, os_1.arch)().includes('s390x')) {
+            return 'linux-s390x';
+        }
         return (0, os_1.arch)().includes('64') ? 'linux-amd64' : 'linux-386';
     }
     static getJfExecutableName() {
diff --git a/src/utils.ts b/src/utils.ts
index a2bf08c6f..141c6b661 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -373,6 +373,9 @@ export class Utils {
         if (arch().includes('arm')) {
             return arch().includes('64') ? 'linux-arm64' : 'linux-arm';
         }
+        if (arch().includes('s390x')) {
+            return 'linux-s390x';
+        }
         return arch().includes('64') ? 'linux-amd64' : 'linux-386';
     }
 
diff --git a/test/main.spec.ts b/test/main.spec.ts
index 86880b3a2..2d6a9edbb 100644
--- a/test/main.spec.ts
+++ b/test/main.spec.ts
@@ -218,6 +218,7 @@ describe('JFrog CLI V1 URL Tests', () => {
         ['linux' as NodeJS.Platform, 'arm64', 'jfrog', 'v1/1.2.3/jfrog-cli-linux-arm64/jfrog'],
         ['linux' as NodeJS.Platform, '386', 'jfrog', 'v1/1.2.3/jfrog-cli-linux-386/jfrog'],
         ['linux' as NodeJS.Platform, 'arm', 'jfrog', 'v1/1.2.3/jfrog-cli-linux-arm/jfrog'],
+        ['linux' as NodeJS.Platform, 's390x', 'jfrog', 'v1/1.2.3/jfrog-cli-linux-s390x/jfrog'],
     ];
 
     test.each(cases)('CLI Url for %s-%s', (platform, arch, fileName, expectedUrl) => {
@@ -242,6 +243,7 @@ describe('JFrog CLI V2 URL Tests', () => {
         ['linux' as NodeJS.Platform, 'arm64', 'jfrog', 'v2/2.3.4/jfrog-cli-linux-arm64/jfrog'],
         ['linux' as NodeJS.Platform, '386', 'jfrog', 'v2/2.3.4/jfrog-cli-linux-386/jfrog'],
         ['linux' as NodeJS.Platform, 'arm', 'jfrog', 'v2/2.3.4/jfrog-cli-linux-arm/jfrog'],
+        ['linux' as NodeJS.Platform, 's390x', 'jfrog', 'v2/2.3.4/jfrog-cli-linux-s390x/jfrog'],
     ];
 
     test.each(cases)('CLI Url for %s-%s', (platform, arch, fileName, expectedUrl) => {