diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index 0bf197b6..2439fdea 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -22,7 +22,7 @@
 - name: Save current git-repo status on the target to aid with restoring in case of problems
   when: "matrix_playbook_commit_hash_preservation_enabled|bool"
   block:
-    - name: Get local git hash # noqa command-instead-of-module
+    - name: Get local git hash  # noqa command-instead-of-module
       delegate_to: 127.0.0.1
       become: false
       register: git_describe
diff --git a/roles/matrix-bridge-hookshot/defaults/main.yml b/roles/matrix-bridge-hookshot/defaults/main.yml
index 96781f9a..4c39876a 100644
--- a/roles/matrix-bridge-hookshot/defaults/main.yml
+++ b/roles/matrix-bridge-hookshot/defaults/main.yml
@@ -129,8 +129,8 @@ matrix_hookshot_generic_user_id_prefix: '_webhooks_'
 
 
 matrix_hookshot_feeds_enabled: true
-matrix_hookshot_feeds_pollIntervalSeconds: 600
-matrix_hookshot_feeds_pollTimeoutSeconds: 10
+matrix_hookshot_feeds_pollIntervalSeconds: 600  # no-qa var-naming
+matrix_hookshot_feeds_pollTimeoutSeconds: 10  # no-qa var-naming
 
 
 # There is no need to edit ports. use matrix_hookshot_container_http_host_bind_ports below to expose ports instead.
diff --git a/roles/matrix-postgres/tasks/import_postgres.yml b/roles/matrix-postgres/tasks/import_postgres.yml
index 107a1f88..d5bfaa86 100644
--- a/roles/matrix-postgres/tasks/import_postgres.yml
+++ b/roles/matrix-postgres/tasks/import_postgres.yml
@@ -51,8 +51,8 @@
     daemon_reload: true
   register: matrix_postgres_import_start_result
 
-- when: matrix_postgres_import_start_result.changed | bool
-  name: Wait a bit, so that Postgres can start
+- name: Wait a bit, so that Postgres can start
+  when: matrix_postgres_import_start_result.changed | bool
   ansible.builtin.wait_for:
     timeout: "{{ postgres_start_wait_time }}"
   delegate_to: 127.0.0.1
diff --git a/roles/matrix-postgres/tasks/run_vacuum.yml b/roles/matrix-postgres/tasks/run_vacuum.yml
index 1b769f01..c1bf8d76 100644
--- a/roles/matrix-postgres/tasks/run_vacuum.yml
+++ b/roles/matrix-postgres/tasks/run_vacuum.yml
@@ -30,8 +30,8 @@
     daemon_reload: true
   register: matrix_postgres_vacuum_start_result
 
-- when: matrix_postgres_vacuum_start_result.changed | bool
-  name: Wait a bit, so that Postgres can start
+- name: Wait a bit, so that Postgres can start
+  when: matrix_postgres_vacuum_start_result.changed | bool
   ansible.builtin.wait_for:
     timeout: "{{ postgres_start_wait_time }}"
   delegate_to: 127.0.0.1