diff --git a/__tests__/get-arch.test.ts b/__tests__/get-arch.test.ts
index 54dbb86..2dff9b0 100644
--- a/__tests__/get-arch.test.ts
+++ b/__tests__/get-arch.test.ts
@@ -1,15 +1,63 @@
 import getArch from '../src/get-arch';
 
 describe('getArch', () => {
-  test('processor architecture', () => {
-    expect(getArch('x64')).toBe('64bit');
-    expect(getArch('arm')).toBe('ARM');
-    expect(getArch('arm64')).toBe('ARM64');
+  test('processor architecture < 0.102.0', () => {
+    expect(getArch('x64', 'linux', '0.101.0')).toBe('64bit');
+    expect(getArch('x64', 'macOS', '0.101.0')).toBe('64bit');
+    expect(getArch('x64', 'windows', '0.101.0')).toBe('64bit');
+
+    expect(getArch('arm', 'linux', '0.101.0')).toBe('ARM');
+    expect(getArch('arm', 'macOS', '0.101.0')).toBe('ARM');
+    expect(getArch('arm', 'windows', '0.101.0')).toBe('ARM');
+
+    expect(getArch('arm64', 'linux', '0.101.0')).toBe('ARM64');
+    expect(getArch('arm64', 'macOS', '0.101.0')).toBe('ARM64');
+    expect(getArch('arm64', 'windows', '0.101.0')).toBe('ARM64');
+  });
+
+  test('processor architecture === 0.102.z', () => {
+    expect(getArch('x64', 'linux', '0.102.0')).toBe('64bit');
+    expect(getArch('x64', 'macOS', '0.102.0')).toBe('universal');
+    expect(getArch('x64', 'windows', '0.102.0')).toBe('64bit');
+
+    expect(getArch('arm', 'macOS', '0.102.0')).toBe('universal');
+
+    expect(getArch('arm64', 'linux', '0.102.0')).toBe('ARM64');
+    expect(getArch('arm64', 'macOS', '0.102.0')).toBe('universal');
+    expect(getArch('arm64', 'windows', '0.102.0')).toBe('ARM64');
+  });
+
+  test('processor architecture === 0.103.z', () => {
+    expect(getArch('x64', 'linux', '0.103.0')).toBe('amd64');
+    expect(getArch('x64', 'darwin', '0.103.0')).toBe('universal');
+    expect(getArch('x64', 'windows', '0.103.0')).toBe('amd64');
+
+    expect(getArch('arm', 'darwin', '0.103.0')).toBe('universal');
+
+    expect(getArch('arm64', 'linux', '0.103.0')).toBe('arm64');
+    expect(getArch('arm64', 'darwin', '0.103.0')).toBe('universal');
+    expect(getArch('arm64', 'windows', '0.103.0')).toBe('arm64');
+  });
+
+  test('processor architecture > 0.103.0', () => {
+    expect(getArch('x64', 'linux', '0.104.0')).toBe('amd64');
+    expect(getArch('x64', 'darwin', '0.104.0')).toBe('universal');
+    expect(getArch('x64', 'windows', '0.104.0')).toBe('amd64');
+
+    expect(getArch('arm', 'darwin', '0.104.0')).toBe('universal');
+
+    expect(getArch('arm64', 'linux', '0.104.0')).toBe('arm64');
+    expect(getArch('arm64', 'darwin', '0.104.0')).toBe('universal');
+    expect(getArch('arm64', 'windows', '0.104.0')).toBe('arm64');
   });
 
   test('exception', () => {
     expect(() => {
-      getArch('mips');
+      getArch('mips', 'linux', '0.101.0');
     }).toThrowError('mips is not supported');
+
+    expect(() => {
+      getArch('arm', 'linux', '0.102.0')
+    }).toThrowError('arm is not supported');
   });
 });
diff --git a/__tests__/get-os.test.ts b/__tests__/get-os.test.ts
index fbb204a..4d1404d 100644
--- a/__tests__/get-os.test.ts
+++ b/__tests__/get-os.test.ts
@@ -2,14 +2,26 @@ import getOS from '../src/get-os';
 
 describe('getOS', () => {
   test('os type', () => {
-    expect(getOS('linux')).toBe('Linux');
-    expect(getOS('darwin')).toBe('macOS');
-    expect(getOS('win32')).toBe('Windows');
+    expect(getOS('linux', '0.101.0')).toBe('Linux');
+    expect(getOS('darwin', '0.101.0')).toBe('macOS');
+    expect(getOS('win32', '0.101.0')).toBe('Windows');
+
+    expect(getOS('linux', '0.102.0')).toBe('Linux');
+    expect(getOS('darwin', '0.102.0')).toBe('darwin');
+    expect(getOS('win32', '0.102.0')).toBe('Windows');
+
+    expect(getOS('linux', '0.103.0')).toBe('linux');
+    expect(getOS('darwin', '0.103.0')).toBe('darwin');
+    expect(getOS('win32', '0.103.0')).toBe('windows');
+
+    expect(getOS('linux', '0.104.0')).toBe('linux');
+    expect(getOS('darwin', '0.104.0')).toBe('darwin');
+    expect(getOS('win32', '0.104.0')).toBe('windows');
   });
 
   test('exception', () => {
     expect(() => {
-      getOS('centos');
+      getOS('centos', '0.101.0');
     }).toThrowError('centos is not supported');
   });
 });
diff --git a/src/get-arch.ts b/src/get-arch.ts
index 04e56af..1ab05b8 100644
--- a/src/get-arch.ts
+++ b/src/get-arch.ts
@@ -1,11 +1,32 @@
-export default function getArch(arch: string): string {
+export default function getArch(arch: string, os: string, version: string): string {
+  const segments = version.split('.').map(s => parseInt(s));
+
+  if (os == 'darwin' || (os == 'macOS' && segments[0] >= 0 && segments[1] >= 102)) {
+    return 'universal'
+  }
+
+  if (segments[0] >= 0 && segments[1] >= 103) {
+    switch (arch) {
+      case 'x64':
+        return 'amd64';
+      case 'arm64':
+        return 'arm64';
+      default:
+        throw new Error(`${arch} is not supported`);
+    }
+  }
+
   switch (arch) {
     case 'x64':
-      return '64bit';
+      return (segments[0] >= 0 && segments[1] >= 103) ? 'amd64' : '64bit';
     case 'arm':
-      return 'ARM';
+      if (segments[0] >= 0 && segments[1] < 102) {
+        return 'ARM';
+      } else {
+        throw new Error(`${arch} is not supported`);
+      }
     case 'arm64':
-      return 'ARM64';
+      return (segments[0] >= 0 && segments[1] >= 103) ? 'arm64' : 'ARM64';
     default:
       throw new Error(`${arch} is not supported`);
   }
diff --git a/src/get-os.ts b/src/get-os.ts
index 8360089..0e97e97 100644
--- a/src/get-os.ts
+++ b/src/get-os.ts
@@ -1,11 +1,12 @@
-export default function getOS(platform: string): string {
+export default function getOS(platform: string, version: string): string {
+  const segments = version.split('.').map(s => parseInt(s));
   switch (platform) {
     case 'linux':
-      return 'Linux';
+      return (segments[0] >= 0 && segments[1] >= 103) ? 'linux' : 'Linux'
     case 'darwin':
-      return 'macOS';
+      return (segments[0] >= 0 && segments[1] >= 102) ? 'darwin' : 'macOS'
     case 'win32':
-      return 'Windows';
+      return (segments[0] >= 0 && segments[1] >= 103) ? 'windows' : 'Windows'
     default:
       throw new Error(`${platform} is not supported`);
   }
diff --git a/src/installer.ts b/src/installer.ts
index e3dfd35..9d188fb 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -47,10 +47,10 @@ export async function installer(version: string): Promise<void> {
   const extended: string = core.getInput('extended');
   core.debug(`Hugo extended: ${extended}`);
 
-  const osName: string = getOS(process.platform);
+  const osName: string = getOS(process.platform, version);
   core.debug(`Operating System: ${osName}`);
 
-  const archName: string = getArch(process.arch);
+  const archName: string = getArch(process.arch, osName, version);
   core.debug(`Processor Architecture: ${archName}`);
 
   const toolURL: string = getURL(osName, archName, extended, version);