diff --git a/roles/base/tasks/software/aur_helper.yml b/roles/base/tasks/software/aur_helper.yml
index 72afb23..d24d0bc 100644
--- a/roles/base/tasks/software/aur_helper.yml
+++ b/roles/base/tasks/software/aur_helper.yml
@@ -22,10 +22,10 @@
     validate: "visudo -cf %s"
   when: ansible_facts['os_family'] == "Archlinux"
 
-# - name: "[Arch] Install AUR helper"
-#   community.general.aur:
-#     name: "{{ aur_helper }}"
-#     state: present
-#     use: makepkg
-#   become_user: "{{ aur_build_user }}"
-#   when: ansible_facts['os_family'] == "Archlinux"
+- name: "[Arch] Install AUR helper"
+  community.general.aur:
+    name: "{{ aur_helper }}"
+    state: present
+    use: makepkg
+  become_user: "{{ aur_build_user }}"
+  when: ansible_facts['os_family'] == "Archlinux"
diff --git a/roles/base/tasks/system_setup/hostname.yml b/roles/base/tasks/system_setup/hostname.yml
index 3c6cecb..3bb2ace 100644
--- a/roles/base/tasks/system_setup/hostname.yml
+++ b/roles/base/tasks/system_setup/hostname.yml
@@ -1,3 +1,3 @@
 - name: base | system_setup | hostname
   hostname:
-    name: "{{ hostname | default(ansible_hostname) }}"
\ No newline at end of file
+    name: "{{ hostname | default(ansible_facts['hostname']) }}"
\ No newline at end of file
diff --git a/roles/base/vars/archlinux.yml b/roles/base/vars/archlinux.yml
index 29ff375..4dbfb6b 100644
--- a/roles/base/vars/archlinux.yml
+++ b/roles/base/vars/archlinux.yml
@@ -24,4 +24,7 @@ vim_package: vim
 
 ssh_service: sshd
 
-update_ca: /usr/bin/update-ca-trust
\ No newline at end of file
+update_ca: /usr/bin/update-ca-trust
+
+aur_build_user: aurbuilduser
+aur_helper: paru
\ No newline at end of file
diff --git a/roles/domaincontroller/templates/smb.conf.j2 b/roles/domaincontroller/templates/smb.conf.j2
index a321f7f..d88fa36 100644
--- a/roles/domaincontroller/templates/smb.conf.j2
+++ b/roles/domaincontroller/templates/smb.conf.j2
@@ -1,6 +1,6 @@
 # This file is managed by Ansible
 [global]
-        netbios name = {{ ansible_hostname | upper }}
+        netbios name = {{ ansible_facts['hostname'] | upper }}
         realm = {{ samba_realm }}
         server role = active directory domain controller
         workgroup = {{ samba_workgroup }}
diff --git a/roles/mailserver/tasks/configure_postfix.yml b/roles/mailserver/tasks/configure_postfix.yml
index df85f0f..6e7c936 100644
--- a/roles/mailserver/tasks/configure_postfix.yml
+++ b/roles/mailserver/tasks/configure_postfix.yml
@@ -22,7 +22,7 @@
     - {key: "message_size_limit", value: "0"}                                                                                                             
     - {key: "milter_default_action", value: "accept"}                                                                                                     
     - {key: "mydestination", value: "'localhost, kashyyyk, $myhostname'"}                                                                                     
-    - {key: "myhostname", value: "{{ hostname | default(ansible_hostname) }}"}                                                                                               
+    - {key: "myhostname", value: "{{ hostname | default(ansible_facts['hostname']) }}"}                                                                                               
     - {key: "mynetworks", value: "'{{ mynetworks }}'"}                           
     - {key: "mynetworks_style", value: "subnet"}                                                                                                          
     - {key: "readme_directory", value: "no"}