diff --git a/roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml b/roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml
index aea17cc02..ff7fa2d8b 100644
--- a/roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml
+++ b/roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml
@@ -37,6 +37,13 @@
     -keyout {{ matrix_ssl_certificate_cert_key_path }} \
     -out {{ matrix_ssl_certificate_cert_path }} \
     -days 3650
-  become: true
-  become_user: "{{ matrix_user_username }}"
   when: "not matrix_ssl_certificate_cert_path_stat_result.stat.exists"
+
+- name: Adjust SSL certificate file ownership
+  file:
+    path: "{{ item }}"
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - "{{ matrix_ssl_certificate_cert_key_path }}"
+    - "{{ matrix_ssl_certificate_cert_path }}"