diff --git a/init@homeserver.yml.example b/init@homeserver.yml
similarity index 62%
rename from init@homeserver.yml.example
rename to init@homeserver.yml
index 03f6c9d..8e422fe 100644
--- a/init@homeserver.yml.example
+++ b/init@homeserver.yml
@@ -1,12 +1,16 @@
 # @NOTE run 'ansible-playbook' command on this using 'sudo'
 - name: Initialize homeserver
-  hosts: armitage
+  hosts: "{{ chosen_host | default('armitage') }}"
   remote_user: root
   vars:
     harden: true
-    local_facts:
-      user_id: ~ # REQUIRED
-      user_dir: ~ # REQUIRED
+  vars_files:
+    - vars/local_facts.yml # REQUIRED
+    - vars/vim_settings.yml # REQUIRED
+    - vars/tail_net.yml
+    - vars/crowdsec.yml
+    - vars/users@{{ inventory_hostname | default('homeserver') }}.yml
+    - vars/config@{{ inventory_hostname | default('homeserver') }}.yml
   tasks:
     - name: Hardening SSH server
       ansible.builtin.include_role:
@@ -22,10 +26,19 @@
         name: init-server
         tasks_from: core@install-pkgs
         handlers_from: core
-    # - name: Reboot machine for shell environment change
-    #   ansible.builtin.reboot:
-    #     msg: Rebooting machine
     - name: Initializing groups and users
       ansible.builtin.include_role:
         name: init-server
-        tasks_from: ssh-users
\ No newline at end of file
+        tasks_from: ssh-users
+    - name: Updating hostname
+      become: true
+      ansible.builtin.hostname:
+        name: "{{ inventory_hostname }}"
+    - name: Updating host icon name
+      become: true
+      ansible.builtin.command:
+        cmd: "hostnamectl set-icon-name computer-server"
+    - name: Rebooting machine for hostname change
+      become: true
+      ansible.builtin.reboot:
+        msg: "Rebooting machine"
\ No newline at end of file