diff --git a/hosts b/hosts
index 98e5e3967a0e60240f6ee54f2763b8a50afdad8e..651f3a24b9dba7ce9e41387d12a677315ff1e206 100644
--- a/hosts
+++ b/hosts
@@ -30,19 +30,19 @@ fflux-test ansible_user=root
 fflux-test
 
 # machines which run api.freifunk.lu
-[API]
+[api-web]
 
 # machines which run map.freifunk.lu
-[MAP]
+[map-web]
 
 # machines which run stats.freifunk.lu
-[STATS]
+[stats-web]
 
 # machines which run firmware.freifunk.lu
-[FIRMWARE]
+[firmware-web]
 
 # machines which run freifunk.lu
-[WORDPRESS]
+[website-web]
 
 # machine which are gateways for freifunk.lu
 [fflux]