diff --git a/inventories/chaosknoten/hosts.yaml b/inventories/chaosknoten/hosts.yaml
index 6a4dd9e..8158538 100644
--- a/inventories/chaosknoten/hosts.yaml
+++ b/inventories/chaosknoten/hosts.yaml
@@ -55,3 +55,11 @@ all:
         keycloak:
         wiki:
         onlyoffice:
+    infrastructure_authorized_keys_hosts:
+      hosts:
+        cloud:
+        pad:
+        public-reverse-proxy:
+        keycloak:
+        wiki:
+        onlyoffice:
diff --git a/inventories/z9/hosts.yaml b/inventories/z9/hosts.yaml
index 059dbac..ad8fd9c 100644
--- a/inventories/z9/hosts.yaml
+++ b/inventories/z9/hosts.yaml
@@ -59,3 +59,11 @@ all:
     docker_compose_hosts:
       hosts:
         uptime-kuma:
+    infrastructure_authorized_keys_hosts:
+      hosts:
+        light:
+        mqtt:
+        zigbee2mqtt:
+        authoritative-dns:
+        mailserver-endpoint:
+        uptime-kuma:
diff --git a/playbooks/deploy.yaml b/playbooks/deploy.yaml
index ebb0559..fd33911 100644
--- a/playbooks/deploy.yaml
+++ b/playbooks/deploy.yaml
@@ -7,6 +7,11 @@
   roles:
     - deploy_ssh_server_config
 
+- name: Ensure deployment of infrastructure authorized keys
+  hosts: infrastructure_authorized_keys_hosts
+  roles:
+    - infrastructure_authorized_keys
+
 - name: Ensure Nextcloud config
   hosts: nextcloud_hosts
   roles:
diff --git a/playbooks/roles/infrastructure_authorized_keys/README.md b/playbooks/roles/infrastructure_authorized_keys/README.md
new file mode 100644
index 0000000..fd7819b
--- /dev/null
+++ b/playbooks/roles/infrastructure_authorized_keys/README.md
@@ -0,0 +1,3 @@
+# Role `infrastructure_authorized_keys`
+
+A role for deploying the infrastructure authorized keys from [this repo](https://gitlab.hamburg.ccc.de/ccchh/infrastructure-authorized-keys).
diff --git a/playbooks/roles/infrastructure_authorized_keys/tasks/main.yaml b/playbooks/roles/infrastructure_authorized_keys/tasks/main.yaml
new file mode 100644
index 0000000..9eb8377
--- /dev/null
+++ b/playbooks/roles/infrastructure_authorized_keys/tasks/main.yaml
@@ -0,0 +1,7 @@
+- name: deploy infrastructure authorized keys
+  ansible.posix.authorized_key:
+    state: present
+    user: chaos
+    exclusive: true
+    key: https://gitlab.hamburg.ccc.de/ccchh/infrastructure-authorized-keys/-/raw/trunk/authorized_keys?ref_type=heads&inline=false
+    
\ No newline at end of file