diff --git a/defaults/main.yml b/defaults/main.yml
index 8fd219f..a6c0cd3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 gopass_base_url: "https://github.com/gopasspw/gopass"
-gopass_download_base_url: "{{ gopass_base_url }}/releases/download"
\ No newline at end of file
+gopass_dl_url: "{{ gopass_base_url }}/releases/download"
+gopass_file: "gopass_{{ gopass_ver.stdout }}_{{ ansible_system | lower }}_{{ ansible_machine | regex_replace('x86_64','amd64') }}"
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index e8d3889..4a6dddf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -36,7 +36,7 @@
     block:
     - name: Install the gopass rpm from a remote repo for yum distro
       yum:
-        name: "{{ gopass_download_base_url }}/v{{ gopass_ver.stdout }}/gopass_{{ gopass_ver.stdout }}_{{ ansible_system }}_{{ ansible_machine }}.rpm"
+        name: "{{ gopass_dl_url }}/v{{ gopass_ver.stdout }}/{{ gopass_file }}.rpm"
         state: present
         disable_gpg_check: yes
       when:
@@ -44,8 +44,7 @@
 
     - name: Install the gopass rpm from a remote repo for dnf distro
       dnf:
-#        name: "{{ gopass_download_base_url }}/v{{ gopass_ver.stdout }}/gopass_{{ gopass_ver.stdout }}_{{ ansible_system | lower }}_{{ ansible_machine }}.rpm"
-        name: "{{ gopass_download_base_url }}/v{{ gopass_ver.stdout }}/gopass_{{ gopass_ver.stdout }}_{{ ansible_system  | lower }}_amd64.rpm"
+        name: "{{ gopass_dl_url }}/v{{ gopass_ver.stdout }}/{{ gopass_file }}.rpm"
         state: present
         disable_gpg_check: yes
       when:
@@ -53,7 +52,7 @@
 
     - name: Install the gopass deb package from the internet for deb distro
       apt:
-        deb: "{{ gopass_download_base_url }}/v{{ gopass_ver.stdout }}/gopass_{{ gopass_ver.stdout }}_{{ ansible_system }}_{{ ansible_machine }}.deb"
+        deb: "{{ gopass_dl_url }}/v{{ gopass_ver.stdout }}/{{ gopass_file }}.deb"
         state: present
       when:
         - ansible_pkg_mgr == "apt"