diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml
index 1fce40a84..9e30d7077 100644
--- a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml
+++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml
@@ -9,7 +9,10 @@
       so that the matrix-nginx-proxy role would run after the matrix-bridge-mautrix-wsproxy role.
   when: matrix_nginx_proxy_role_executed | default(False) | bool
 
-- block:
+- tags:
+    - always
+  when: matrix_mautrix_wsproxy_enabled|bool
+  block:
     - name: Generate Mautrix Wsproxy proxying configuration for matrix-nginx-proxy
       ansible.builtin.set_fact:
         matrix_mautrix_wsproxy_matrix_nginx_proxy_configuration: |
@@ -33,9 +36,6 @@
             +
             [matrix_mautrix_wsproxy_matrix_nginx_proxy_configuration]
           }}
-  tags:
-    - always
-  when: matrix_mautrix_wsproxy_enabled|bool
 
 - name: Warn about reverse-proxying if matrix-nginx-proxy not used
   ansible.builtin.debug:
diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
index 1f47e9edf..53cd067a5 100644
--- a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
+++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
@@ -15,14 +15,14 @@
     matrix_mautrix_wsproxy_syncproxy_requires_restart: false
 
 - name: Ensure Mautrix wsproxy image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_wsproxy_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_wsproxy_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_wsproxy_docker_image_force_pull }}"
 
 - name: Ensure Mautrix syncproxy image is pulled
-  docker_image:
+  community.docker.docker_image:
     name: "{{ matrix_mautrix_wsproxy_syncproxy_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_wsproxy_syncproxy_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"