diff --git a/site-dev.yml b/site-dev.yml
deleted file mode 100644
index d0695bb..0000000
--- a/site-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-- hosts: docker_swarm_manager_node
-  roles:
-    - whoami
-    - wallabag
-    - miniflux
-    - searx
-    - traggo
-    - monica
-    - nextcloud
-    - shaarli
-    - landingpage
-    - blog
diff --git a/site.yml b/site.yml
index 3f0826b..574236b 100644
--- a/site.yml
+++ b/site.yml
@@ -1,21 +1,75 @@
 ---
 
 - hosts: all
-  roles:
-    - system-upgrade
-    - docker
-    - docker-swarm
+  tasks:
+    - name: Make sure system is fully upgraded
+      include_role: 
+        role: system-upgrade
+        tags: system-upgrade
+
+    - name: Make sure docker is installed
+      include_role: 
+        role: docker
+        tags: docker
+
+    - name: Make sure docker-swarm is set up
+      include_role: 
+        role: docker-swarm
+        tags: docker-swarm
 
 - hosts: docker_swarm_manager_node
-  roles:
-    - caddy
-    - whoami
-    - wallabag
-    - miniflux
-    - searx
-    - traggo
-    - monica
-    - nextcloud
-    - shaarli
-    - landingpage
-    - blog
+  tasks:
+    - name: Install caddy reverse proxy
+      include_role: 
+        role: caddy
+        tags: caddy
+
+    - name: Install whoami
+      include_role: 
+        role: whoami
+        tags: whoami
+
+    - name: Install wallabag
+      include_role: 
+        role: wallabag
+        tags: wallabag
+
+    - name: Install miniflux
+      include_role: 
+        role: miniflux
+        tags: miniflux
+
+    - name: Install searx
+      include_role: 
+        role: searx
+        tags: searx
+
+    - name: Install traggo
+      include_role: 
+        role: traggo
+        tags: traggo
+
+    - name: Install monica
+      include_role: 
+        role: monica
+        tags: monica
+
+    - name: Install nextcloud
+      include_role: 
+        role: nextcloud
+        tags: nextcloud
+
+    - name: Install shaarli
+      include_role: 
+        role: shaarli
+        tags: shaarli
+
+    - name: Install landingpage
+      include_role: 
+        role: landingpage
+        tags: landingpage
+
+    - name: Install blog
+      include_role: 
+        role: blog
+        tags: blog