diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9820a6201..6ce287217 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # 2018-08-08
 
 
+## Renaming Ansible playbook tag
+
+The command for executing the whole playbook has changed.
+The `setup-main` tag got renamed to `setup-all`.
+
+
 ## Docker container linking
 
 Changed the way the Docker containers are linked together. The ones that need to communicate with others operate in a `matrix` network now and not in the default bridge network.
\ No newline at end of file
diff --git a/README.md b/README.md
index 853cd09a8..da4a4a2b9 100644
--- a/README.md
+++ b/README.md
@@ -200,7 +200,7 @@ Run this as-is to set up a server.
 This doesn't start any services just yet (another step does this later - below).
 Feel free to re-run this any time you think something is off with the server configuration.
 
-	ansible-playbook -i inventory/hosts setup.yml --tags=setup-main
+	ansible-playbook -i inventory/hosts setup.yml --tags=setup-all
 
 
 ### Restoring an existing SQLite database (from another installation)
diff --git a/roles/matrix-server/tasks/main.yml b/roles/matrix-server/tasks/main.yml
index 2df3b60d4..9a87b23dc 100644
--- a/roles/matrix-server/tasks/main.yml
+++ b/roles/matrix-server/tasks/main.yml
@@ -2,15 +2,15 @@
 
 - include: tasks/setup_base.yml
   tags:
-    - setup-main
+    - setup-all
 
 - include: tasks/setup_main.yml
   tags:
-    - setup-main
+    - setup-all
 
 - include: tasks/setup_ssl.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-ssl
 
 - include: tasks/upgrade_postgres.yml
@@ -19,38 +19,38 @@
 
 - include: tasks/setup_postgres.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-postgres
 
 - include: tasks/setup_s3fs.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-s3fs
 
 - include: tasks/setup_goofys.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-goofys
 
 - include: tasks/setup_coturn.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-coturn
 
 - include: tasks/setup_synapse.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-synapse
     - setup-coturn
 
 - include: tasks/setup_riot_web.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-riot-web
 
 - include: tasks/setup_nginx_proxy.yml
   tags:
-    - setup-main
+    - setup-all
     - setup-nginx-proxy
 
 - include: tasks/start.yml