diff --git a/roles/caddy/tasks/main.yaml b/roles/caddy/tasks/main.yaml
index 664b3c9..d390224 100644
--- a/roles/caddy/tasks/main.yaml
+++ b/roles/caddy/tasks/main.yaml
@@ -7,17 +7,20 @@
       - name: debian
         version_min: 11
       - name: ubuntu
-        version_min: 20
+        version_min: 22
+
+- name: Ensure legacy caddy apt repository not present
+  ansible.builtin.file:
+    path: /etc/apt/sources.list.d/caddy-stable.list
+    state: absent
 
 - name: Add caddy apt repository
-  ansible.builtin.include_role:
-    name: apt_repository
-  vars:
-    repo_name: caddy-stable
-    repo_url: https://dl.cloudsmith.io/public/caddy/stable/deb/debian
-    repo_key_url: https://dl.cloudsmith.io/public/caddy/stable/gpg.key
-    repo_suite: any-version
-    repo_components:
+  ansible.builtin.deb822_repository:
+    name: caddy-stable
+    uris: https://dl.cloudsmith.io/public/caddy/stable/deb/debian
+    signed_by: https://dl.cloudsmith.io/public/caddy/stable/gpg.key
+    suites: any-version
+    components:
       - main
   when: >
     (ansible_distribution == 'Debian' and ansible_distribution_major_version | int == 11) or