diff --git a/bank.yaml b/bank.yaml
index dd84606..e3f5930 100644
--- a/bank.yaml
+++ b/bank.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: bank
   roles:
     - common
diff --git a/bar.yaml b/bar.yaml
index 32e4465..4ef9f78 100644
--- a/bar.yaml
+++ b/bar.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: bank-pi.bitlair.nl
   vars:
     raspi_rotate_display: "2"
diff --git a/common.yaml b/common.yaml
index fc949b9..755110a 100644
--- a/common.yaml
+++ b/common.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: debian
   roles:
     - common
diff --git a/fotos.yaml b/fotos.yaml
index 99f871c..d61fd5f 100644
--- a/fotos.yaml
+++ b/fotos.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: fotos
   roles:
     - common
diff --git a/git-ci.yaml b/git-ci.yaml
index 07982f4..e2e557d 100644
--- a/git-ci.yaml
+++ b/git-ci.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: git-ci
   roles:
     - common
diff --git a/git.yaml b/git.yaml
index 2a5ae7e..050090d 100644
--- a/git.yaml
+++ b/git.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: git
   roles:
     - common
diff --git a/hosts.yaml b/hosts.yaml
new file mode 100644
index 0000000..b812d09
--- /dev/null
+++ b/hosts.yaml
@@ -0,0 +1,43 @@
+all:
+  children:
+    raspi:
+      hosts:
+        bank-pi.bitlair.nl:
+    kvm:
+      hosts:
+        kvm4.bitlair.nl:
+    debian:
+      children:
+        bank:
+          hosts:
+            bank.bitlair.nl:
+        fotos:
+          hosts:
+            blockchain.bitlair.nl:
+        git:
+          hosts:
+            git.bitlair.nl:
+        git-ci:
+          hosts:
+            git-ci.bitlair.nl:
+        pad:
+          hosts:
+            pad.bitlair.nl:
+        lights:
+          hosts:
+            lights.bitlair.nl:
+        mqtt_internal:
+          hosts:
+            mqtt.bitlair.nl:
+        monitoring:
+          hosts:
+            dashboard.bitlair.nl:
+        music:
+          hosts:
+            music.bitlair.nl:
+        services:
+          hosts:
+            service.bitlair.nl:
+        wiki:
+          hosts:
+            wiki.bitlair.nl:
diff --git a/inventory b/inventory
deleted file mode 100644
index 692594a..0000000
--- a/inventory
+++ /dev/null
@@ -1,20 +0,0 @@
-# Inventory
-
-[raspi]
-bank-pi.bitlair.nl
-
-[kvm]
-kvm4.bitlair.nl
-
-[debian]
-bank.bitlair.nl
-blockchain.bitlair.nl
-git.bitlair.nl
-git-ci.bitlair.nl
-pad.bitlair.nl
-lights.bitlair.nl
-mqtt.bitlair.nl
-dashboard.bitlair.nl
-music.bitlair.nl
-service.bitlair.nl
-wiki.bitlair.nl
diff --git a/monitoring.yaml b/monitoring.yaml
index e8c3e78..c439507 100644
--- a/monitoring.yaml
+++ b/monitoring.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: monitoring
   roles:
     - common
diff --git a/mqtt-internal.yaml b/mqtt-internal.yaml
index 84297ef..93a00a5 100644
--- a/mqtt-internal.yaml
+++ b/mqtt-internal.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: mqtt_internal
   roles:
     - common
diff --git a/music.yaml b/music.yaml
index 1c2431d..2f77110 100644
--- a/music.yaml
+++ b/music.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: music
   roles:
     - common
diff --git a/pad.yaml b/pad.yaml
index d9f6f3e..2325204 100644
--- a/pad.yaml
+++ b/pad.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: pad
   vars:
     acme_san_domains:
diff --git a/roles/common-bitlair/tasks/main.yaml b/roles/common-bitlair/tasks/main.yaml
index 78845a3..c28063b 100644
--- a/roles/common-bitlair/tasks/main.yaml
+++ b/roles/common-bitlair/tasks/main.yaml
@@ -1,8 +1,8 @@
 ---
 - name: Update authorized_keys
+  tags: authorized_keys
   ansible.builtin.template:
     src: authorized_keys.j2
     dest: /root/.ssh/authorized_keys
     mode: 0600
   when: root_access is defined and root_access
-  tags: authorized_keys
diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
index 2fcb2b4..0f19df2 100644
--- a/roles/common/tasks/main.yaml
+++ b/roles/common/tasks/main.yaml
@@ -1,17 +1,13 @@
 ---
-
-- name: Import debian-upgrade.yaml if not bookworm
+- tags: [ debian-upgrade, never ]
   ansible.builtin.import_tasks:
     file: debian-upgrade.yaml
   when: ansible_facts['distribution_release'] != "bookworm"
-  tags: [ debian-upgrade, never ]
 
-- name: Import debian-backports.yaml
+- tags: debian_backports
   ansible.builtin.import_tasks:
     file: debian-backports.yaml
 
-  tags: debian_backports
-
 - tags: unattended_updates
   ansible.builtin.import_tasks:
     file: unattended-updates.yaml
diff --git a/services.yaml b/services.yaml
index af77daf..5bbd959 100644
--- a/services.yaml
+++ b/services.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: services
   roles:
     - common
diff --git a/www.yaml b/www.yaml
index f912d15..4ee6399 100644
--- a/www.yaml
+++ b/www.yaml
@@ -1,5 +1,4 @@
 ---
-
 - hosts: wiki
   roles:
     - common