diff --git a/hosts b/hosts
index be9343bab43ad981e0d05dc636ff199abcedb555..f795d528158d07409db529a8535935eacaaa34c5 100644
--- a/hosts
+++ b/hosts
@@ -9,7 +9,7 @@
 #   - A hostname/ip can be a member of multiple groups
 
 # server list is here
-fflux-test ansible_host=89.58.3.252 new_hostname=fflux-test
+fflux-test ansible_host=89.58.3.252 network_index=19
 
 # machines which are used for tests
 [test]
diff --git a/initial_server_setup/initial_setup.yml b/initial_server_setup/initial_setup.yml
index 3f86a220da3928cae8c3fc7fe61d5d4b30c06e29..7b15f1dfdcaf14f5fb6a17ba03b6cb7f9d151d54 100644
--- a/initial_server_setup/initial_setup.yml
+++ b/initial_server_setup/initial_setup.yml
@@ -28,7 +28,7 @@
     # Change Hostname
     - name: "Update Hostnames"
       ansible.builtin.hostname:
-        name: "{{ new_hostname }}"
+        name: "{{ inventory_hostname }}"
       tags: hostname
 
     # Update /etc/hosts
@@ -36,14 +36,14 @@
       ansible.builtin.lineinfile:
         path: /etc/hosts
         regexp: "^{{ ansible_default_ipv4.address }}"
-        line: "{{ ansible_default_ipv4.address }} {{ new_hostname }} {{ new_hostname }}.freifunk.lu"
+        line: "{{ ansible_default_ipv4.address }} {{ inventory_hostname }} {{ inventory_hostname }}.freifunk.lu"
         state: present
       tags: network,hostname,dns
     - name: Make sure an IPV6 entry in /etc/hosts exists
       ansible.builtin.lineinfile:
         path: /etc/hosts
         regexp: "^{{ ansible_default_ipv6.address }}"
-        line: "{{ ansible_default_ipv6.address }} {{ new_hostname }} {{ new_hostname }}.freifunk.lu"
+        line: "{{ ansible_default_ipv6.address }} {{ inventory_hostname }} {{ inventory_hostname }}.freifunk.lu"
         state: present
       tags: network,hostname,dns