diff --git a/playbooks/linux/ubuntu-server/deploy_collabora_code.yml b/playbooks/linux/ubuntu-server/deploy_collabora_code.yml
index 295204d..8d8554e 100644
--- a/playbooks/linux/ubuntu-server/deploy_collabora_code.yml
+++ b/playbooks/linux/ubuntu-server/deploy_collabora_code.yml
@@ -29,26 +29,31 @@
     collabora_code_domain: "office.test.local"
 
   tasks:
-  - name: Ensure APT keyrings directory exists
+  - name: Ensure the apt keyrings directory exists
     ansible.builtin.file:
       path: /etc/apt/keyrings
       state: directory
       mode: '0755'
 
-  - name: Download CODE GPG key
+  - name: Download Collabora CODE GPG signing key
     ansible.builtin.get_url:
       url: https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg
-      dest: /usr/share/keyrings/collaboraonline-release-keyring.gpg
+      dest: /etc/apt/keyrings/collaboraonline-release-keyring.gpg
       mode: '0644'
 
-  - name: Add CODE repository
-    ansible.builtin.apt_repository:
-      repo: "deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-ubuntu2004 ./"
+  - name: Add Collabora CODE APT repository (DEB822 format)
+    ansible.builtin.deb822_repository:
+      name: collaboraonline
+      types: [deb]
+      uris: [https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb]
+      suites: ['./']
+      signed_by: /etc/apt/keyrings/collaboraonline-release-keyring.gpg
       state: present
-      filename: collabora
-      update_cache: yes
-  
-  - name: Update apt cache
+
+  - name: Update apt cache and install Collabora packages
     ansible.builtin.apt:
-      update_cache: true
-      cache_valid_time: 3600
\ No newline at end of file
+      name:
+        - coolwsd
+        - code-brand
+      state: present
+      update_cache: yes
\ No newline at end of file