diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 7b61b41..eb87abf 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Enable grafana apt-key
-  apt_key: url="https://apt.grafana.com/gpg.key"
+  apt_key: url="https://apt.grafana.com/gpg.key" keyring="/etc/apt/trusted.gpg.d/grafana.gpg"
 
 - name: Enable grafana repository
   apt_repository: repo="deb https://apt.grafana.com stable main"
diff --git a/roles/icinga/tasks/main.yml b/roles/icinga/tasks/main.yml
index 2a3a1a7..1c297ea 100644
--- a/roles/icinga/tasks/main.yml
+++ b/roles/icinga/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Enable icinga apt-key
-  apt_key: url="https://packages.icinga.com/icinga.key"
+  apt_key: url="https://packages.icinga.com/icinga.key" keyring="/etc/apt/trusted.gpg.d/icinga.gpg"
 
 - name: Enable icinga repository
   apt_repository:
diff --git a/roles/pbs/tasks/main.yml b/roles/pbs/tasks/main.yml
index 7befdec..b99ace5 100644
--- a/roles/pbs/tasks/main.yml
+++ b/roles/pbs/tasks/main.yml
@@ -2,7 +2,8 @@
 
 - name: Enable PBS apt-key
   apt_key:
-    url: "https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg"
+    url: "https://enterprise.proxmox.com/debian/proxmox-release-{{ ansible_distribution_release }}.gpg"
+    keyring: "/etc/apt/trusted.gpg.d/proxmox-release-{{ ansible_distribution_release }}.gpg"
 
 - name: Enable PBS repository
   apt_repository: