diff --git a/roles/anydesk/tasks/main.yml b/roles/anydesk/tasks/main.yml
index 671f0bd..cfd8618 100644
--- a/roles/anydesk/tasks/main.yml
+++ b/roles/anydesk/tasks/main.yml
@@ -5,11 +5,11 @@
     state: present
 
 - get_url:
-    url: 'https://download.anydesk.com/linux/anydesk_5.5.6-1_{{ ansible_architecture }}.deb'
-    dest: '/tmp/anydesk_{{ ansible_architecture }}.deb'
+    url: 'https://download.anydesk.com/linux/anydesk_5.5.6-1_{{ pkgarch }}.deb'
+    dest: '/tmp/anydesk_{{ pkgarch }}.deb'
 
-- shell: dpkg -i '/tmp/anydesk_{{ ansible_architecture }}.deb'
+- shell: dpkg -i '/tmp/anydesk_{{ pkgarch }}.deb'
 
 - file:
-    dest: '/tmp/anydesk_{{ ansible_architecture }}.deb'
+    dest: '/tmp/anydesk_{{ pkgarch }}.deb'
     state: absent
diff --git a/roles/checkhw/tasks/main.yml b/roles/checkhw/tasks/main.yml
index 02462d6..f06e88e 100644
--- a/roles/checkhw/tasks/main.yml
+++ b/roles/checkhw/tasks/main.yml
@@ -11,4 +11,12 @@
     hwpoints: 3
   when: ansible_memtotal_mb|int > 4096 and ansible_processor_vcpus|int >= 4
 
+- set_fact:
+    pkgarch: amd64
+  when: ansible_architecture == 'x86_64'
+
+- set_fact:
+    pkgarch: i386
+  when: ansible_architecture == 'i386'
+
 - setup: filter=ansible_local
diff --git a/roles/googlechrome/tasks/main.yml b/roles/googlechrome/tasks/main.yml
index 1fc5f9f..01241fc 100644
--- a/roles/googlechrome/tasks/main.yml
+++ b/roles/googlechrome/tasks/main.yml
@@ -2,9 +2,13 @@
 - block:
   
   - get_url:
-      url: "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
-      dest: /tmp/google-chrome-stable_current_amd64.deb
+      url: "https://dl.google.com/linux/direct/google-chrome-stable_current_{{ pkgarch }}.deb"
+      dest: "/tmp/google-chrome-stable_current_{{ pkgarch }}.deb"
   
-  - shell: dpkg -i /tmp/google-chrome-stable_current_amd64.deb
+  - shell: dpkg -i "/tmp/google-chrome-stable_current_{{ pkgarch }}.deb"
+
+  - file:
+      name: "/tmp/google-chrome-stable_current_{{ pkgarch }}.deb"
+      state: absent
 
   when: hwpoints|int >= 2