diff --git a/tasks/install.yml b/tasks/install.yml
index 6beaa9e..5734ce3 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -37,19 +37,33 @@
     msg: "⚠️ Detected buggy Samba version 4.22.4 — upgrade recommended!"
   when: "'4.22.4' in samba_version.stdout"
 
-- name: Add Samba Team Debian GPG key (only if upgrade is needed)
-  ansible.builtin.apt_key:
+- name: Add Samba Team Debian GPG key (modern method)
+  ansible.builtin.get_url:
     url: https://pkg.samba.org/keys/samba-pubkey.asc
-    state: present
+    dest: /usr/share/keyrings/samba-team-archive-keyring.gpg
+    mode: '0644'
   when: "'4.22.4' in samba_version.stdout"
 
-- name: Add Samba Team Debian repository (only if upgrade is needed)
+- name: Add Samba Team Debian repository (modern method)
   ansible.builtin.apt_repository:
-    repo: "deb http://pkg.samba.org/packages/debian $(lsb_release -cs) samba-422"
+    repo: "deb [signed-by=/usr/share/keyrings/samba-team-archive-keyring.gpg] http://pkg.samba.org/packages/debian {{ ansible_lsb.codename | default('bookworm') }} samba-422"
     state: present
     filename: samba-team
   when: "'4.22.4' in samba_version.stdout"
 
+# - name: Add Samba Team Debian GPG key (only if upgrade is needed)
+#   ansible.builtin.apt_key:
+#     url: https://pkg.samba.org/keys/samba-pubkey.asc
+#     state: present
+#   when: "'4.22.4' in samba_version.stdout"
+
+# - name: Add Samba Team Debian repository (only if upgrade is needed)
+#   ansible.builtin.apt_repository:
+#     repo: "deb http://pkg.samba.org/packages/debian $(lsb_release -cs) samba-422"
+#     state: present
+#     filename: samba-team
+#   when: "'4.22.4' in samba_version.stdout"
+
 - name: Update APT cache (only if upgrade is needed)
   ansible.builtin.apt:
     update_cache: yes