diff --git a/roles/chat/tasks/main.yaml b/roles/chat/tasks/main.yaml
index 696d5e5..cad172f 100644
--- a/roles/chat/tasks/main.yaml
+++ b/roles/chat/tasks/main.yaml
@@ -28,7 +28,8 @@
   ansible.builtin.shell:
     cmd: npm install --global yarn
 
-- stat: path=/opt/thelounge
+- ansible.builtin.stat:
+    path: /opt/thelounge
   register: src_path
 
 - name: Retreive thelounge source
@@ -67,14 +68,14 @@
     state: present
 
 - name: Ensure JS and JSON syntax checking packages are installed
-  yarn:
+  community.general.yarn:
     name: "{{ item }}"
     global: yes
-    state: latest # FIXME: Remove when https://github.com/ansible/ansible/pull/39557 makes it in
+    # state: latest # FIXME: Remove when https://github.com/ansible/ansible/pull/39557 makes it in
   with_items:
     - esprima
     - jsonlint
-  changed_when: no # FIXME: Remove when https://github.com/ansible/ansible/pull/39557 makes it in
+      # changed_when: no # FIXME: Remove when https://github.com/ansible/ansible/pull/39557 makes it in
 
 - name: Configure templates
   ansible.builtin.template: