diff --git a/roles/matrix-server/tasks/main.yml b/roles/matrix-server/tasks/main.yml
index 6f5b7bbec..7b6d5d3b8 100644
--- a/roles/matrix-server/tasks/main.yml
+++ b/roles/matrix-server/tasks/main.yml
@@ -2,28 +2,28 @@
 
 - include: tasks/setup/main.yml
 
-- include: tasks/upgrade_postgres.yml
-  tags:
-    - upgrade-postgres
+# - include: tasks/upgrade_postgres.yml
+#   tags:
+#     - upgrade-postgres
 
 - include: tasks/start.yml
   tags:
     - start
 
-- include: tasks/register_user.yml
-  tags:
-    - register-user
+# - include: tasks/register_user.yml
+#   tags:
+#     - register-user
 
-- include: tasks/import_sqlite_db.yml
-  tags:
-    - import-sqlite-db
+# - include: tasks/import_sqlite_db.yml
+#   tags:
+#     - import-sqlite-db
 
-- include: tasks/import_media_store.yml
-  tags:
-    - import-media-store
+# - include: tasks/import_media_store.yml
+#   tags:
+#     - import-media-store
 
-- include: tasks/self_check/main.yml
-  delegate_to: 127.0.0.1
-  become: false
-  tags:
-    - self-check
+# - include: tasks/self_check/main.yml
+#   delegate_to: 127.0.0.1
+#   become: false
+#   tags:
+#     - self-check
diff --git a/roles/matrix-server/tasks/setup/main.yml b/roles/matrix-server/tasks/setup/main.yml
index ac6cb782e..55d774763 100644
--- a/roles/matrix-server/tasks/setup/main.yml
+++ b/roles/matrix-server/tasks/setup/main.yml
@@ -8,10 +8,10 @@
   tags:
     - setup-all
 
-- include: tasks/setup/setup_ssl.yml
-  tags:
-    - setup-all
-    - setup-ssl
+# - include: tasks/setup/setup_ssl.yml
+#   tags:
+#     - setup-all
+#     - setup-ssl
 
 - include: tasks/setup/setup_postgres.yml
   tags:
@@ -70,4 +70,4 @@
   tags:
     - setup-all
     - setup-nginx-proxy
-    - setup-well-known
\ No newline at end of file
+    - setup-well-known