diff --git a/hosts b/hosts
index 0bfda42ec0f4a75f9a437e19c716faa6ae269d0c..10f099ffb1786800e68cf248ed47da84d8042e58 100644
--- a/hosts
+++ b/hosts
@@ -1,22 +1,18 @@
 
 # Nameskonvention für Server: Pratchett Name/Charaktere
 # Namensliste: https://wiki.lspace.org/List_of_Pratchett_characters
-# Nächste freie Namen: vimes, cake, colon, detritus, dibbler, dorfl, gaspode, quirm, cherry, nobby, ramkin, ron, shoe, slant, angua, vetinary, bursar, coin, dean, hex, hix, worblehat, luggage. mustrum, rincewind, wrangler, stibbons, whitlow  
+# Nächste freie Namen: vimes, cake, colon, detritus, dibbler, dorfl, gaspode, quirm, cherry, nobby, ramkin, ron, shoe, slant, angua, vetinary, bursar, coin, dean, worblehat, luggage. mustrum, rincewind, wrangler, stibbons, whitlow  
 
 [test]
 
 [prod]
 
-# Interner Server Warpzone 
-# Umgebaute Watchguard im Serverschrank 
-# https://wiki.warpzone.ms/intern:warpzone_internal_it_infrastructure#host_fuer_interne_dienste_watchguard_xtm_505
+# Interner Proxmox-Server
 # Für Verbindungen über den Webserver als Jumphost folgende Parameter ergänzen: 
 # ansible_ssh_common_args='-o ForwardAgent=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q 159.69.57.51"'
-
-# Interner Proxmox-Server (neu ab 09-2022) 
 weatherwax   ansible_ssh_host=192.168.0.200
 
-# Server für interne Dienste (neu ab 09-2022)
+# Server für interne Dienste
 # Container auf dem internen Proxmox Server 
 # Wichtige Optionen: Nesting = Yes, keyctl = enabled
 ogg          ansible_ssh_host=192.168.0.201
@@ -47,4 +43,3 @@ hex         ansible_ssh_host=10.111.10.100
 # Container auf dem warpzone.remote Proxmox-Server 
 # Wichtige Optionen: Nesting = Yes, keyctl = enabled
 hix         ansible_ssh_host=10.111.10.101
-
diff --git a/hosts.yml b/hosts.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3cae4f415f91eb7ffdf7a407c5d91e464257b554
--- /dev/null
+++ b/hosts.yml
@@ -0,0 +1,65 @@
+---
+# Nameskonvention für Server: Pratchett Name/Charaktere
+# Namensliste: https://wiki.lspace.org/List_of_Pratchett_characters
+# Nächste freie Namen: vimes, cake, colon, detritus, dibbler, dorfl, gaspode, quirm, cherry, nobby, ramkin, ron, shoe, slant, angua, vetinary, bursar, coin, dean, worblehat, luggage. mustrum, rincewind, wrangler, stibbons, whitlow  
+
+prod:
+  children:
+    pyhsical:
+      hosts:
+        # Interner Proxmox-Server
+        # Für Verbindungen über den Webserver als Jumphost folgende Parameter ergänzen: 
+        # ansible_ssh_common_args='-o ForwardAgent=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q 159.69.57.51"'
+        weatherwax:
+          ansible_ssh_host: 192.168.0.200
+
+        # Externe Server Warpzone
+        # Öffentlicher Root Server Warpzone bei Hetzner
+        tiffany:
+          ansible_ssh_host: 159.69.57.15
+
+    vms:
+      children:
+        weatherwax:
+          hosts:
+            # Server für interne Dienste
+            # Container auf dem internen Proxmox Server
+            # Wichtige Optionen: Nesting = Yes, keyctl = enabled
+            ogg:
+              ansible_ssh_host: 192.168.0.201
+
+            # Server für VPN Verbindung zum Webserver
+            # Container auf dem internen Proxmox Server
+            # Wichtige Optionen: Nesting = Yes, keyctl = enabled
+            carrot:
+              ansible_ssh_host: 192.168.0.202
+
+        tiffany:
+          hosts:
+            # Öffentlicher Webserver Warpzone
+            # VM auf Tiffany
+            webserver:
+              ansible_ssh_host: 159.69.57.51
+
+            # Vorstands-VM
+            # VM auf Tiffany
+            # Auch erreichbar unter verwaltung.warpzone.ms
+            verwaltung:
+              ansible_ssh_host: 195.201.179.60
+
+event:
+  children:
+    physical:
+      hosts:
+        # Physischer Server für Veranstaltungen / Camps
+        # warpzone.remote Proxmox-Server
+        hex:
+          ansible_ssh_host: 10.111.10.100
+
+    vms:
+      hosts:
+        # Virtueller Server für Infrastruktur-Dienste auf Veranstaltungen / Camps
+        # Container auf dem warpzone.remote Proxmox-Server
+        # Wichtige Optionen: Nesting = Yes, keyctl = enabled
+        hix:
+          ansible_ssh_host: 10.111.10.101
diff --git a/keyfiles/jabertwo.pub b/keyfiles/jabertwo.pub
index 310a8d66df774852ffffb0f8bf2da3e05e100724..a60b75565e848d4093df5e2e0903fa1916690965 100644
--- a/keyfiles/jabertwo.pub
+++ b/keyfiles/jabertwo.pub
@@ -1,2 +1,2 @@
-ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBCxsaY88ZP/bk15JNs2zzVbpG4S4uLYlzfMVlqSZQJVZ0t65vJMKp2yepp6BdOb2rAuXnhPX5zrFEP/A8idR0DFLR5kp6pvdKOeWToND3V763WXJvOutyoKIXPGSuEJF+Q== jabertwo
-ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBGR9N60F+0annoCi9cM+94jSxsw8KPgMf7GqKoFmxwpcDf6fd7Vc5sRQg0avnEg009D2nxihED0y2eTP2Tzn6eQQ/2LRXRfMCa+hRK99YYPUjpszH/y2bC2r/08CvcdeVA== jabertwo
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBCxsaY88ZP/bk15JNs2zzVbpG4S4uLYlzfMVlqSZQJVZ0t65vJMKp2yepp6BdOb2rAuXnhPX5zrFEP/A8idR0DFLR5kp6pvdKOeWToND3V763WXJvOutyoKIXPGSuEJF+Q== jabertwo-home
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBGR9N60F+0annoCi9cM+94jSxsw8KPgMf7GqKoFmxwpcDf6fd7Vc5sRQg0avnEg009D2nxihED0y2eTP2Tzn6eQQ/2LRXRfMCa+hRK99YYPUjpszH/y2bC2r/08CvcdeVA== jabertwo-mob
diff --git a/verwaltung/docker_gitea/templates/docker-compose.yml b/verwaltung/docker_gitea/templates/docker-compose.yml
index 00c6b4b424bca995bc0c76ad9df63ae3582be8a9..e8a3681b9c68ac87a4f11ee8fbeda9b1620fb7c7 100644
--- a/verwaltung/docker_gitea/templates/docker-compose.yml
+++ b/verwaltung/docker_gitea/templates/docker-compose.yml
@@ -4,7 +4,7 @@ version: "2.4"
 services:
 
   app:
-    image: gitea/gitea:1.17.3
+    image: gitea/gitea:1.19.0
     restart: always
     depends_on:
       - db
diff --git a/verwaltung/docker_nextcloud/templates/docker-compose.yml b/verwaltung/docker_nextcloud/templates/docker-compose.yml
index 8d1615ffda7981b6af0fe8cf4fac22aa3767c32b..361fe7a682208fda8d213aadf41bc7a7d3f6afc5 100644
--- a/verwaltung/docker_nextcloud/templates/docker-compose.yml
+++ b/verwaltung/docker_nextcloud/templates/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   redis:
 
-    image: redis:7.0.5
+    image: redis:7.0.10
     restart: always
     networks:
       - default
diff --git a/webserver/docker_coturn/templates/docker-compose.yml b/webserver/docker_coturn/templates/docker-compose.yml
index b0091990ed2a273909919a3f7170cd76ca7eae76..9b928f44041eb31c93ae57bfc8079fe360bb995a 100644
--- a/webserver/docker_coturn/templates/docker-compose.yml
+++ b/webserver/docker_coturn/templates/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
 
   coturn:
-    image: coturn/coturn:4.5.2
+    image: coturn/coturn:4.6.1
     restart: always
     command:
       - turnserver
diff --git a/webserver/docker_gitlab/templates/docker-compose.yml b/webserver/docker_gitlab/templates/docker-compose.yml
index 0ef35cbc83ec37ef57d3ed127f00be133a830313..73240988c6bf36403cdfdc3ed6ad58a13c2ce229 100644
--- a/webserver/docker_gitlab/templates/docker-compose.yml
+++ b/webserver/docker_gitlab/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: gitlab/gitlab-ce:15.9.3-ce.0
+    image: gitlab/gitlab-ce:15.10.2-ce.0
     restart: always
     ports:
       - "444:22"
diff --git a/webserver/docker_matterbridge/templates/docker-compose.yml b/webserver/docker_matterbridge/templates/docker-compose.yml
index 382867034c559f35a51e1aee6533a81c70f4db48..bc264a33fabbd17d6f9a52b6a7c2e32570f77e0a 100644
--- a/webserver/docker_matterbridge/templates/docker-compose.yml
+++ b/webserver/docker_matterbridge/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   cw:
 
-    image: 42wim/matterbridge:1.25
+    image: 42wim/matterbridge:1.26
     restart: always
     volumes:
       - /srv/matterbridge/etc/matterbridge_cw.toml:/matterbridge.toml:ro
@@ -16,7 +16,7 @@ services:
 
   wz:
 
-    image: 42wim/matterbridge:1.25
+    image: 42wim/matterbridge:1.26
     restart: always
     volumes:
       - /srv/matterbridge/etc/matterbridge_wz.toml:/matterbridge.toml:ro
diff --git a/webserver/docker_wordpress/templates/Dockerfile b/webserver/docker_wordpress/templates/Dockerfile
index 36579bd894c7126a6de771c8f8c29ee27ba5df39..274b26b2644af7d7b08574f9f77d63415e3782cb 100644
--- a/webserver/docker_wordpress/templates/Dockerfile
+++ b/webserver/docker_wordpress/templates/Dockerfile
@@ -1,4 +1,4 @@
-FROM wordpress:6.1.1-php8.2-apache
+FROM wordpress:6.2.0-php8.2-apache
 
 # install the PHP extensions we need
 RUN set -x \
diff --git a/webserver/docker_workadventure/templates/docker-compose.yml b/webserver/docker_workadventure/templates/docker-compose.yml
index ef95316c89ac40abe36045be097fad8cbc2547dd..2d091920d9f6e947ba4857706376b148118bc1fe 100644
--- a/webserver/docker_workadventure/templates/docker-compose.yml
+++ b/webserver/docker_workadventure/templates/docker-compose.yml
@@ -92,7 +92,7 @@ services:
 
 
   redis:
-    image: redis:6.2.6
+    image: redis:7.0.10
     restart: always
     networks:
       - default