diff --git a/tasks/install-client.yml b/tasks/install-client.yml
index 77fe977..d055679 100644
--- a/tasks/install-client.yml
+++ b/tasks/install-client.yml
@@ -2,9 +2,9 @@
 
 - name: Compose the Minio client download url
   set_fact:
-    _minio_client_download_url: "https://dl.minio.io/client/mc/release/linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/mc"
+    _minio_client_download_url: "https://dl.minio.io/client/mc/release/linux-{{ go_arch }}/mc"
 
-- name: "Get the Minio client checksum for {{ go_arch_map[ansible_architecture] | default(ansible_architecture) }} architecture"
+- name: "Get the Minio client checksum for {{ go_arch }} architecture"
   set_fact:
     _minio_client_checksum: "{{ lookup('url', _minio_client_download_url + '.sha256sum').split(' ')[0] }}"
 
diff --git a/tasks/install-server.yml b/tasks/install-server.yml
index 2191240..109bea8 100644
--- a/tasks/install-server.yml
+++ b/tasks/install-server.yml
@@ -2,9 +2,9 @@
 
 - name: Compose the Minio server download url
   set_fact:
-    _minio_server_download_url: "https://dl.minio.io/server/minio/release/linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/minio"
+    _minio_server_download_url: "https://dl.minio.io/server/minio/release/linux-{{ go_arch }}/minio"
 
-- name: "Get the Minio server checksum for {{ go_arch_map[ansible_architecture] | default(ansible_architecture) }} architecture"
+- name: "Get the Minio server checksum for {{ go_arch }} architecture"
   set_fact:
     _minio_server_checksum: "{{ lookup('url', _minio_server_download_url + '.sha256sum').split(' ')[0] }}"
 
diff --git a/vars/main.yml b/vars/main.yml
index 3238c61..f1b3a4a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -5,3 +5,5 @@ go_arch_map:
   aarch64: 'arm64'
   armv7l: 'arm'
   armv6l: 'arm6vl'
+
+go_arch: "{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"