diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index 04e34b1c..ca8dbd9a 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -304,3 +304,12 @@ matrix_ssl_use_staging: false
 
 # Specifies when to attempt to retrieve new SSL certificates from Let's Encrypt.
 matrix_ssl_renew_cron_time_definition: "15 4 */5 * *"
+
+# Variables to Control which parts of the role run.
+run_setup: true
+run_upgrade_postgres: true
+run_start: true
+run_register_user: true
+run_import_sqlite_db: true
+run_import_media_store: true
+run_self_check: true
diff --git a/roles/matrix-server/tasks/main.yml b/roles/matrix-server/tasks/main.yml
index 6f5b7bbe..c76c2070 100644
--- a/roles/matrix-server/tasks/main.yml
+++ b/roles/matrix-server/tasks/main.yml
@@ -1,29 +1,36 @@
 ---
 
 - include: tasks/setup/main.yml
+  when: run_setup
 
 - include: tasks/upgrade_postgres.yml
   tags:
     - upgrade-postgres
+  when: run_upgrade_postgres
 
 - include: tasks/start.yml
   tags:
     - start
+  when: run_start
 
 - include: tasks/register_user.yml
   tags:
     - register-user
+  when: run_register_user
 
 - include: tasks/import_sqlite_db.yml
   tags:
     - import-sqlite-db
+  when: run_import_sqlite_db
 
 - include: tasks/import_media_store.yml
   tags:
     - import-media-store
+  when: run_import_media_store
 
 - include: tasks/self_check/main.yml
   delegate_to: 127.0.0.1
   become: false
   tags:
     - self-check
+  when: run_self_check