diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -17,6 +17,7 @@
     roles:
       - paas-lxc
       - paas-docker
+      - mastodon
     network:
       ipv6_tunnel: True
   equatower:
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -77,6 +77,9 @@
   #
   # Nasqueron servers
   #
+  mastodon:
+    - .org/nasqueron/social
+
   webserver-legacy:
     # Nasqueron members
     - .be/dereckson
diff --git a/roles/mastodon/init.sls b/roles/mastodon/init.sls
deleted file mode 100644
--- a/roles/mastodon/init.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-#   -------------------------------------------------------------
-#   Salt — Mastodon
-#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#   Project:        Nasqueron
-#   License:        Trivial work, not eligible to copyright
-#   -------------------------------------------------------------
-
-include:
-  - ./public
diff --git a/roles/webserver-content/init.sls b/roles/webserver-content/init.sls
--- a/roles/webserver-content/init.sls
+++ b/roles/webserver-content/init.sls
@@ -11,3 +11,4 @@
   - .com/paysannerebelle
   - .org/eglide
   - .org/nasqueron/docs
+  - .org/nasqueron/social
diff --git a/roles/mastodon/public/init.sls b/roles/webserver-content/org/nasqueron/social.sls
rename from roles/mastodon/public/init.sls
rename to roles/webserver-content/org/nasqueron/social.sls
--- a/roles/mastodon/public/init.sls
+++ b/roles/webserver-content/org/nasqueron/social.sls
@@ -6,6 +6,8 @@
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
+{% if salt['node.has_web_content'](".org/nasqueron/social") %}
+
 /srv/data/mastodon/public/support:
   file.recurse:
     - source: salt://wwwroot/nasqueron.org/mastodon/support
@@ -15,3 +17,4 @@
     - dir_mode: 711
     - file_mode: 644
 
+{% endif %}