diff --git a/inventory/host_vars/hulder.yaml b/inventory/host_vars/hulder.yaml
index 5c67bc7..e0fe751 100644
--- a/inventory/host_vars/hulder.yaml
+++ b/inventory/host_vars/hulder.yaml
@@ -1,6 +1,5 @@
 ---
 ansible_user: root
-#ansible_host: 10.4.0.49
 
 base_root_swap_mib: "{{ 1024 * 16 }}"
 base_root_efi_mib: 512
diff --git a/playbooks/install.yaml b/playbooks/install.yaml
index fc1cc9b..fb4bf50 100644
--- a/playbooks/install.yaml
+++ b/playbooks/install.yaml
@@ -1,10 +1,10 @@
 ---
-- name: Check if we appear to be inside an ArchLinux live install environment
+- name: detect archinso environment
   hosts: all
   roles:
     - detect_archiso
 
-- name: Provision new Arch workstation from scratch
+- name: provision base archlinux installation
   hosts: base
   tags: base
   roles:
diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yaml
index c659a6c..dc00005 100644
--- a/roles/base/tasks/main.yaml
+++ b/roles/base/tasks/main.yaml
@@ -1,6 +1,6 @@
 ---
 - block:
-  # - import_tasks: archinstall/mirrorlist.yaml
+  - import_tasks: archinstall/mirrorlist.yaml
   - import_tasks: archinstall/partition.yaml
   - import_tasks: archinstall/initialize_root_zvol.yaml
   - import_tasks: archinstall/initialize_swap.yaml
@@ -8,5 +8,4 @@
   - import_tasks: archinstall/prepare_chroot.yaml
   - import_tasks: archinstall/install_os.yaml
   - import_tasks: archinstall/postinstall_snapshot.yaml
-  when: base_root_disks is defined and ansible_hostname == 'archiso'
-
+  when: archiso_detected and base_root_disks is defined
diff --git a/roles/detect_archiso/tasks/main.yaml b/roles/detect_archiso/tasks/main.yaml
index fa38a9a..ec3e07a 100644
--- a/roles/detect_archiso/tasks/main.yaml
+++ b/roles/detect_archiso/tasks/main.yaml
@@ -1,13 +1,9 @@
+---
 - name: check for archinstall in path
   command: which archinstall
   ignore_errors: true
   register: which_archinstall
 
-- name: inspect archinstall result
+- name: inspect archinstall check result
   set_fact:
     archiso_detected: "{{ which_archinstall.rc == 0 }}"
-
-- name: load alternate host vars
-  include_vars:
-    file: "../../../inventory/host_vars/{{ hostname }}.yaml"
-  when: archiso_detected and hostname is defined