diff --git a/gateway/all_gw_config.yml b/gateway/all_gw_config.yml
index 8da849989e75a4c9fdd99673420139976a1eeae5..84038bf8910e9e4fb279a3372ea4acd82dd3da2d 100644
--- a/gateway/all_gw_config.yml
+++ b/gateway/all_gw_config.yml
@@ -1,7 +1,7 @@
 ---
 # Defining the remote server where the package will be deployed
 - name: "Deploy new gateway config"
-  hosts: test
+  hosts: gateway
   remote_user: root
   become: true
   become_method: ansible.builtin.sudo
diff --git a/gateway/initial_gw_setup.yml b/gateway/initial_gw_setup.yml
index 2b88d5d60a59057d2404ac673d1705af7aaa15f2..be17c5e903b6c8533e44d6dfae3c94053eebf8a9 100644
--- a/gateway/initial_gw_setup.yml
+++ b/gateway/initial_gw_setup.yml
@@ -1,6 +1,6 @@
 ---
 - name: Initial Gateway Setup
-  hosts: test
+  hosts: initial
   become: true
   become_method: ansible.builtin.sudo
 
diff --git a/hosts b/hosts
index 298a0917b1882234ea139ef7b2203dc711104f1e..09b7d9abfaf6d65a6237e2651c9b42d3589dd535 100644
--- a/hosts
+++ b/hosts
@@ -24,7 +24,7 @@ server_scripts_dir=~/repos/Infrastructure-Intern/scripts
 
 # new machine come here
 [initial]
-#fflux-test
+fflux-test
 
 # machines which run api.freifunk.lu
 [API]
@@ -44,6 +44,9 @@ server_scripts_dir=~/repos/Infrastructure-Intern/scripts
 # machine which are gateways for freifunk.lu
 [fflux]
 
+[gateway]
+fflux-test
+
 [gw1]
 
 [gw2]
diff --git a/initial_server_setup/initial_setup.yml b/initial_server_setup/initial_setup.yml
index 7b15f1dfdcaf14f5fb6a17ba03b6cb7f9d151d54..3f4d5f1949fb6b19dd6d43ae3c07986e00d89fcf 100644
--- a/initial_server_setup/initial_setup.yml
+++ b/initial_server_setup/initial_setup.yml
@@ -1,6 +1,6 @@
 ---
 - name: Initial Server Setup
-  hosts: test
+  hosts: initial
   become: true
 
   vars_files: