diff --git a/tasks/general/software/aur.yml b/tasks/general/software/aur.yml
index 7ec17b1..d768bd7 100644
--- a/tasks/general/software/aur.yml
+++ b/tasks/general/software/aur.yml
@@ -4,7 +4,7 @@
 
 - name: General | Software | AUR | Facts 01
   set_fact:
-    aur_user: aur-user
+    aur_user: aurbuilder
     aur_build_dir: ~/src
     aur_helper: yay
     aur_helper_url: https://aur.archlinux.org/yay-bin.git
@@ -12,6 +12,7 @@
 - name: General | Software | AUR | Facts 02
   set_fact:
     aur_helper_dir: "{{ aur_build_dir }}/{{ aur_helper }}"
+    aur_sudoers: "/etc/sudoers.d/sudoers_{{ aur_user }}"
 
 - name: General | Software | AUR | User
   user:
@@ -21,7 +22,7 @@
 
 - name: General | Software | AUR | Sudoers
   lineinfile:
-    path: /etc/sudoers.d/aurbuilder
+    path: "{{ aur_sudoers }}"
     line: "{{ aur_user }} ALL=(ALL) NOPASSWD: /usr/bin/pacman"
     create: true
     mode: '0440'
@@ -42,7 +43,7 @@
         dest: "{{ aur_helper_dir }}"
 
     - name: General | Software | AUR | Install | Build & Integrate
-      command: "cd {{ aur_helper_dir }} && makepkg -si --noconfirm"
+      shell: "cd {{ aur_helper_dir }} && makepkg -si --noconfirm"
       changed_when: true   
 
   when: yay_check.rc != 0