diff --git a/roles/archlinux/tasks/main.yml b/roles/archlinux/tasks/main.yml
index 4270a10..461ef97 100644
--- a/roles/archlinux/tasks/main.yml
+++ b/roles/archlinux/tasks/main.yml
@@ -3,6 +3,10 @@
   ansible.builtin.meta: end_play
   when: ansible_facts['os_family'] != 'Archlinux'
 
+- name: Set hostname
+  ansible.builtin.hostname:
+    name: "{{ inventory_hostname }}"
+
 - name: Archlinux base setup
   ansible.builtin.include_tasks: "{{ item }}"
   loop:
diff --git a/roles/archlinux/tasks/paru.yml b/roles/archlinux/tasks/paru.yml
index e03d42e..b575787 100644
--- a/roles/archlinux/tasks/paru.yml
+++ b/roles/archlinux/tasks/paru.yml
@@ -68,7 +68,7 @@
       ansible.builtin.set_fact:
         paru_url: "{{ item.browser_download_url }}"
       loop: "{{ paru_release.json.assets }}"
-      when: "'os_arch.tar.zst' in item.name"
+      when: "(os_arch + '.tar.zst') in item.name"
 
     - name: Download
       ansible.builtin.get_url:
diff --git a/roles/archlinux/tasks/yay.yml b/roles/archlinux/tasks/yay.yml
index 06d3d63..04c03e4 100644
--- a/roles/archlinux/tasks/yay.yml
+++ b/roles/archlinux/tasks/yay.yml
@@ -22,21 +22,27 @@
         line: "%wheel ALL=(ALL) NOPASSWD: ALL"
         validate: /usr/sbin/visudo -cf %s
 
+    - name: Clean up stale yay sources dir
+      ansible.builtin.file:
+        path: "{{ yay_src_path }}"
+        state: absent
+
     - name: Create yay sources dir
       ansible.builtin.file:
         path: "{{ yay_src_path }}"
         state: directory
         owner: "{{ ansible_user }}"
+        mode: "0755"
 
     - name: Clone git sources
-      become: false
+      become_user: "{{ ansible_user }}"
       ansible.builtin.git:
         repo: "{{ yay_git_repo }}"
         dest: "{{ yay_src_path }}"
 
     # note: this only works because SUDOERS password prompt is disabled
     - name: Build and install
-      become: false
+      become_user: "{{ ansible_user }}"
       ansible.builtin.command:
         chdir: "{{ yay_src_path }}"
         cmd: "makepkg -si -f --noconfirm"