diff --git a/Makefile b/Makefile
index 69e78de..3e7c747 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,8 @@
+all:
+	ansible-playbook playbooks/all.yml
+
+backup:
+	ansible-playbook playbooks/backup.yml
+	
 %:
-	ansible-playbook playbooks/$@.yml
+	ansible-playbook playbooks/all.yml --tags "$@"
diff --git a/inventory/group_vars/dataserver.yml b/inventory/group_vars/dataserver.yml
index bef25b6..813eb06 100644
--- a/inventory/group_vars/dataserver.yml
+++ b/inventory/group_vars/dataserver.yml
@@ -1 +1 @@
-kingston1tb_uuid: "622a8d81-aa2f-460b-a563-c3cdb6285609"
\ No newline at end of file
+kingston1tb_uuid: "622a8d81-aa2f-460b-a563-c3cdb6285609"
diff --git a/playbooks/all.yml b/playbooks/all.yml
index 5ab0bfc..1d920e3 100644
--- a/playbooks/all.yml
+++ b/playbooks/all.yml
@@ -1,18 +1,18 @@
 - name: Setup homeserver
   hosts: homeserver
   roles:
-    - ssh
-    - borg
-    - nsd
-    - syncthing
-    - kms
-    - pizzeria
-    - forgejo
-    - radicale
-    - mastodon
-    - seafile
-    - jitsi
+    - {role: 'ssh', tags: 'ssh'}
+    - {role: 'borg', tags: 'borg'}
+    - {role: 'nsd', tags: 'nsd'}
+    - {role: 'syncthing', tags: 'syncthing'}
+    - {role: 'kms', tags: 'kms'}
+    - {role: 'pizzeria', tags: 'pizzeria'}
+    - {role: 'forgejo', tags: 'forgejo'}
+    - {role: 'radicale', tags: 'radicale'}
+    - {role: 'mastodon', tags: 'mastodon'}
+    - {role: 'seafile', tags: 'seafile'}
+    - {role: 'jitsi', tags: 'jitsi'}
 - name: Setup dataserver
   hosts: dataserver
   roles:
-    - dataserver
+    - {role: 'dataserver', tags: 'dataserver'}
diff --git a/playbooks/borg.yml b/playbooks/borg.yml
deleted file mode 100644
index a93ff21..0000000
--- a/playbooks/borg.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install borg
-  hosts: homeserver
-  roles:
-    - borg
diff --git a/playbooks/dataserver.yml b/playbooks/dataserver.yml
deleted file mode 100644
index 78a3041..0000000
--- a/playbooks/dataserver.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install dataserver
-  hosts: dataserver
-  roles:
-    - dataserver
diff --git a/playbooks/firewall.yml b/playbooks/firewall.yml
deleted file mode 100644
index 262f052..0000000
--- a/playbooks/firewall.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Configure firewall
-  hosts: homeserver
-  roles:
-    - firewall
diff --git a/playbooks/forgejo.yml b/playbooks/forgejo.yml
deleted file mode 100644
index 823a416..0000000
--- a/playbooks/forgejo.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install forgejo
-  hosts: homeserver
-  roles:
-    - forgejo
diff --git a/playbooks/jitsi.yml b/playbooks/jitsi.yml
deleted file mode 100644
index a712e3a..0000000
--- a/playbooks/jitsi.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install Jitsi Meet
-  hosts: homeserver
-  roles:
-    - jitsi
diff --git a/playbooks/kms.yml b/playbooks/kms.yml
deleted file mode 100644
index 8695144..0000000
--- a/playbooks/kms.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install kms stateless server
-  hosts: homeserver
-  roles:
-    - kms
diff --git a/playbooks/mastodon.yml b/playbooks/mastodon.yml
deleted file mode 100644
index f02f8bf..0000000
--- a/playbooks/mastodon.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install Mastodon
-  hosts: homeserver
-  roles:
-    - mastodon
diff --git a/playbooks/nsd.yml b/playbooks/nsd.yml
deleted file mode 100644
index fa4bd7d..0000000
--- a/playbooks/nsd.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install nsd
-  hosts: homeserver
-  roles:
-    - nsd
diff --git a/playbooks/pizzeria.yml b/playbooks/pizzeria.yml
deleted file mode 100644
index 9fd08c5..0000000
--- a/playbooks/pizzeria.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install pizzeria static website
-  hosts: homeserver
-  roles:
-    - pizzeria
diff --git a/playbooks/radicale.yml b/playbooks/radicale.yml
deleted file mode 100644
index 7c04bd0..0000000
--- a/playbooks/radicale.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install Radicale
-  hosts: homeserver
-  roles:
-    - radicale
diff --git a/playbooks/seafile.yml b/playbooks/seafile.yml
deleted file mode 100644
index 54af9df..0000000
--- a/playbooks/seafile.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install Seafile
-  hosts: homeserver
-  roles:
-    - seafile
diff --git a/playbooks/ssh.yml b/playbooks/ssh.yml
deleted file mode 100644
index 04993a9..0000000
--- a/playbooks/ssh.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Configure SSH
-  hosts: homeserver
-  roles:
-    - ssh
diff --git a/playbooks/syncthing.yml b/playbooks/syncthing.yml
deleted file mode 100644
index bd0e1a3..0000000
--- a/playbooks/syncthing.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install syncthing
-  hosts: homeserver
-  roles:
-    - syncthing
diff --git a/playbooks/traefik.yml b/playbooks/traefik.yml
deleted file mode 100644
index 318c7dc..0000000
--- a/playbooks/traefik.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Install traefik
-  hosts: homeserver
-  roles:
-    - traefik