diff --git a/all.yml b/all.yml
index 62eb731..6c26075 100644
--- a/all.yml
+++ b/all.yml
@@ -1,16 +1,29 @@
 ---
 - hosts: lxd_host
+  tags: lxd_host
   roles:
     - lxd_host
 
-#- hosts: containers
+#- hosts: haproxy
 #  roles:
-#    - webserver
-#
-#- hosts: freshrss
-#  roles:
-#    - freshrss
-#
-#- hosts: dokuwiki
-#  roles:
-#    - dokuwiki
+#    - haproxy
+
+# TODO: break out container init into container_default role?
+
+- hosts:
+    - dokuwiki
+    - freshrss
+    - gitweb
+  tags: containers
+  roles:
+    - webserver
+
+- hosts: freshrss
+  tags: [containers, freshrss]
+  roles:
+    - freshrss
+
+- hosts: dokuwiki
+  tags: containers
+  roles:
+    - dokuwiki