diff --git a/inventories/chaosknoten/hosts.yaml b/inventories/chaosknoten/hosts.yaml
index bbc9ff8..0ff2335 100644
--- a/inventories/chaosknoten/hosts.yaml
+++ b/inventories/chaosknoten/hosts.yaml
@@ -4,62 +4,53 @@ all:
       hosts:
         ccchoir:
           ansible_host: ccchoir-intern.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         cloud:
           ansible_host: cloud-intern.hamburg.ccc.de
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         grafana:
           ansible_host: grafana-intern.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         tickets:
           ansible_host: tickets-intern.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         keycloak:
           ansible_host: keycloak-intern.hamburg.ccc.de
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         lists:
           ansible_host: lists.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
         mumble:
           ansible_host: mumble.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
         onlyoffice:
           ansible_host: onlyoffice-intern.hamburg.ccc.de
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         pad:
           ansible_host: pad-intern.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         pretalx:
           ansible_host: pretalx-intern.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         public-reverse-proxy:
           ansible_host: public-reverse-proxy.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
         wiki:
           ansible_host: wiki-intern.hamburg.ccc.de
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
         zammad:
           ansible_host: zammad-intern.hamburg.ccc.de
-          ansible_port: 42666
           ansible_user: chaos
-          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de:42666
+          ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
     docker_compose_hosts:
       hosts:
         ccchoir:
@@ -93,8 +84,19 @@ all:
         public-reverse-proxy:
     ssh_server_config_hosts:
       hosts:
+        ccchoir:
+        cloud:
+        grafana:
         keycloak:
+        lists:
+        mumble:
+        onlyoffice:
+        pad:
+        pretalx:
+        public-reverse-proxy:
+        tickets:
         wiki:
+        zammad:
     certbot_hosts:
       hosts:
         ccchoir: