diff --git a/tasks/repo.yml b/tasks/repo.yml
index 64946cf..f676987 100644
--- a/tasks/repo.yml
+++ b/tasks/repo.yml
@@ -8,11 +8,10 @@
 
 - name: "setup repo key for {{ item }}"
   apt_key:
-    id: "{{ repo.keyid }}"
-    keyserver: "{{ repo.keyserver }}"
-  when:
-    - repo.keyid|d(false)
-    - repo.keyserver|d(false)
+    id: "{{ repo.keyid|default(omit) }}"
+    keyserver: "{{ repo.keyserver|default(omit) }}"
+    url: "{{ repo.keyurl|default(omit) }}"
+  when: (repo.keyid|d(false) and repo.keyserver|d(false)) or repo.keyurl|d(false)
 
 - name: "add repo {{ item }}"
   apt_repository: