diff --git a/roles/matrix-bridge-appservice-discord/tasks/main.yml b/roles/matrix-bridge-appservice-discord/tasks/main.yml
index 06e641106..61dfc73b3 100644
--- a/roles/matrix-bridge-appservice-discord/tasks/main.yml
+++ b/roles/matrix-bridge-appservice-discord/tasks/main.yml
@@ -8,13 +8,13 @@
     - setup-all
     - setup-appservice-discord
 
-- import_tasks: "{{ role_path }}/tasks/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
   when: "run_setup and matrix_appservice_discord_enabled"
   tags:
     - setup-all
     - setup-appservice-discord
 
-- import_tasks: "{{ role_path }}/tasks/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   when: "run_setup and not matrix_appservice_discord_enabled"
   tags:
     - setup-all
diff --git a/roles/matrix-bridge-appservice-discord/tasks/setup-install.yml b/roles/matrix-bridge-appservice-discord/tasks/setup_install.yml
similarity index 100%
rename from roles/matrix-bridge-appservice-discord/tasks/setup-install.yml
rename to roles/matrix-bridge-appservice-discord/tasks/setup_install.yml
diff --git a/roles/matrix-bridge-appservice-discord/tasks/setup-uninstall.yml b/roles/matrix-bridge-appservice-discord/tasks/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-bridge-appservice-discord/tasks/setup-uninstall.yml
rename to roles/matrix-bridge-appservice-discord/tasks/setup_uninstall.yml
diff --git a/roles/matrix-bridge-appservice-irc/tasks/main.yml b/roles/matrix-bridge-appservice-irc/tasks/main.yml
index 9866fce41..a0aa679e6 100644
--- a/roles/matrix-bridge-appservice-irc/tasks/main.yml
+++ b/roles/matrix-bridge-appservice-irc/tasks/main.yml
@@ -8,13 +8,13 @@
     - setup-all
     - setup-appservice-irc
 
-- import_tasks: "{{ role_path }}/tasks/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
   when: "run_setup and matrix_appservice_irc_enabled"
   tags:
     - setup-all
     - setup-appservice-irc
 
-- import_tasks: "{{ role_path }}/tasks/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   when: "run_setup and not matrix_appservice_irc_enabled"
   tags:
     - setup-all
diff --git a/roles/matrix-bridge-appservice-irc/tasks/setup-install.yml b/roles/matrix-bridge-appservice-irc/tasks/setup_install.yml
similarity index 100%
rename from roles/matrix-bridge-appservice-irc/tasks/setup-install.yml
rename to roles/matrix-bridge-appservice-irc/tasks/setup_install.yml
diff --git a/roles/matrix-bridge-appservice-irc/tasks/setup-uninstall.yml b/roles/matrix-bridge-appservice-irc/tasks/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-bridge-appservice-irc/tasks/setup-uninstall.yml
rename to roles/matrix-bridge-appservice-irc/tasks/setup_uninstall.yml
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/main.yml b/roles/matrix-bridge-mautrix-facebook/tasks/main.yml
index b53c6b0bd..f86fadbef 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/main.yml
@@ -8,13 +8,13 @@
     - setup-all
     - setup-mautrix-facebook
 
-- import_tasks: "{{ role_path }}/tasks/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
   when: "run_setup and matrix_mautrix_facebook_enabled"
   tags:
     - setup-all
     - setup-mautrix-facebook
 
-- import_tasks: "{{ role_path }}/tasks/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   when: "run_setup and not matrix_mautrix_facebook_enabled"
   tags:
     - setup-all
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup-install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-facebook/tasks/setup-install.yml
rename to roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup-uninstall.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-facebook/tasks/setup-uninstall.yml
rename to roles/matrix-bridge-mautrix-facebook/tasks/setup_uninstall.yml
diff --git a/roles/matrix-bridge-mautrix-telegram/tasks/main.yml b/roles/matrix-bridge-mautrix-telegram/tasks/main.yml
index c16c03f54..e304aedf3 100644
--- a/roles/matrix-bridge-mautrix-telegram/tasks/main.yml
+++ b/roles/matrix-bridge-mautrix-telegram/tasks/main.yml
@@ -8,13 +8,13 @@
     - setup-all
     - setup-mautrix-telegram
 
-- import_tasks: "{{ role_path }}/tasks/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
   when: "run_setup and matrix_mautrix_telegram_enabled"
   tags:
     - setup-all
     - setup-mautrix-telegram
 
-- import_tasks: "{{ role_path }}/tasks/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   when: "run_setup and not matrix_mautrix_telegram_enabled"
   tags:
     - setup-all
diff --git a/roles/matrix-bridge-mautrix-telegram/tasks/setup-install.yml b/roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-telegram/tasks/setup-install.yml
rename to roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
diff --git a/roles/matrix-bridge-mautrix-telegram/tasks/setup-uninstall.yml b/roles/matrix-bridge-mautrix-telegram/tasks/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-telegram/tasks/setup-uninstall.yml
rename to roles/matrix-bridge-mautrix-telegram/tasks/setup_uninstall.yml
diff --git a/roles/matrix-bridge-mautrix-whatsapp/tasks/main.yml b/roles/matrix-bridge-mautrix-whatsapp/tasks/main.yml
index 1f40d8c04..f74eca0ab 100644
--- a/roles/matrix-bridge-mautrix-whatsapp/tasks/main.yml
+++ b/roles/matrix-bridge-mautrix-whatsapp/tasks/main.yml
@@ -2,13 +2,13 @@
   tags:
     - always
 
-- import_tasks: "{{ role_path }}/tasks/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
   when: "run_setup and matrix_mautrix_whatsapp_enabled"
   tags:
     - setup-all
     - setup-mautrix-whatsapp
 
-- import_tasks: "{{ role_path }}/tasks/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   when: "run_setup and not matrix_mautrix_whatsapp_enabled"
   tags:
     - setup-all
diff --git a/roles/matrix-bridge-mautrix-whatsapp/tasks/setup-install.yml b/roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-whatsapp/tasks/setup-install.yml
rename to roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
diff --git a/roles/matrix-bridge-mautrix-whatsapp/tasks/setup-uninstall.yml b/roles/matrix-bridge-mautrix-whatsapp/tasks/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-whatsapp/tasks/setup-uninstall.yml
rename to roles/matrix-bridge-mautrix-whatsapp/tasks/setup_uninstall.yml
diff --git a/roles/matrix-synapse/tasks/ext/rest-auth/setup.yml b/roles/matrix-synapse/tasks/ext/rest-auth/setup.yml
index 5e546e9fb..31efa5f29 100644
--- a/roles/matrix-synapse/tasks/ext/rest-auth/setup.yml
+++ b/roles/matrix-synapse/tasks/ext/rest-auth/setup.yml
@@ -1,7 +1,7 @@
 ---
 
-- import_tasks: "{{ role_path }}/tasks/ext/rest-auth/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/ext/rest-auth/setup_install.yml"
   when: matrix_synapse_ext_password_provider_rest_auth_enabled
 
-- import_tasks: "{{ role_path }}/tasks/ext/rest-auth/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/ext/rest-auth/setup_uninstall.yml"
   when: "not matrix_synapse_ext_password_provider_rest_auth_enabled"
diff --git a/roles/matrix-synapse/tasks/ext/rest-auth/setup-install.yml b/roles/matrix-synapse/tasks/ext/rest-auth/setup_install.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/ext/rest-auth/setup-install.yml
rename to roles/matrix-synapse/tasks/ext/rest-auth/setup_install.yml
diff --git a/roles/matrix-synapse/tasks/ext/rest-auth/setup-uninstall.yml b/roles/matrix-synapse/tasks/ext/rest-auth/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/ext/rest-auth/setup-uninstall.yml
rename to roles/matrix-synapse/tasks/ext/rest-auth/setup_uninstall.yml
diff --git a/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup.yml b/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup.yml
index a541ab15b..ac4434107 100644
--- a/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup.yml
+++ b/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup.yml
@@ -1,7 +1,7 @@
 ---
 
-- import_tasks: "{{ role_path }}/tasks/ext/shared-secret-auth/setup-install.yml"
+- import_tasks: "{{ role_path }}/tasks/ext/shared-secret-auth/setup_install.yml"
   when: matrix_synapse_ext_password_provider_shared_secret_auth_enabled
 
-- import_tasks: "{{ role_path }}/tasks/ext/shared-secret-auth/setup-uninstall.yml"
+- import_tasks: "{{ role_path }}/tasks/ext/shared-secret-auth/setup_uninstall.yml"
   when: "not matrix_synapse_ext_password_provider_shared_secret_auth_enabled"
diff --git a/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup-install.yml b/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/ext/shared-secret-auth/setup-install.yml
rename to roles/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml
diff --git a/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup-uninstall.yml b/roles/matrix-synapse/tasks/ext/shared-secret-auth/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/ext/shared-secret-auth/setup-uninstall.yml
rename to roles/matrix-synapse/tasks/ext/shared-secret-auth/setup_uninstall.yml