diff --git a/playbooks/roles/ceph_client/tasks/ceph_preinstall.yml b/playbooks/roles/ceph_client/tasks/ceph_preinstall.yml
index 32d3c14532..fbf524d8aa 100644
--- a/playbooks/roles/ceph_client/tasks/ceph_preinstall.yml
+++ b/playbooks/roles/ceph_client/tasks/ceph_preinstall.yml
@@ -25,7 +25,8 @@
 - name: Add ceph apt-keys
   apt_key:
     id: "{{ item.hash_id }}"
-    keyserver: "{{ item.keyserver }}"
+    keyserver: "{{ item.keyserver | default(omit) }}"
+    data: "{{ item.data | default(omit) }}"
     state: "present"
   register: add_keys
   until: add_keys|success
diff --git a/playbooks/roles/haproxy_server/tasks/haproxy_add_ppa_repo.yml b/playbooks/roles/haproxy_server/tasks/haproxy_add_ppa_repo.yml
index 17a483350a..069aa37551 100644
--- a/playbooks/roles/haproxy_server/tasks/haproxy_add_ppa_repo.yml
+++ b/playbooks/roles/haproxy_server/tasks/haproxy_add_ppa_repo.yml
@@ -39,7 +39,8 @@
 - name: Add haproxy apt-keys
   apt_key:
     id: "{{ item.hash_id }}"
-    keyserver: "{{ item.keyserver }}"
+    keyserver: "{{ item.keyserver | default(omit) }}"
+    data: "{{ item.data | default(omit) }}"
     state: "present"
   register: add_keys
   until: add_keys|success