diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index d701135..f4630f9 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -11,9 +11,20 @@
     name:
       - apt-transport-https
       - ca-certificates
-      - gnupg2
     state: present
 
+- name: Ensure additionnal dependencies are installed (on Ubuntu < 20.04 and any other systems).
+  apt:
+    name: gnupg2
+    state: present
+  when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<')
+
+- name: Ensure additionnal dependencies are installed (on Ubuntu >= 20.04).
+  apt:
+    name: gnupg
+    state: present
+  when: ansible_distribution == 'Ubuntu' or ansible_distribution_version is version('20.04', '>=')
+
 - name: Add Docker apt key.
   apt_key:
     url: "{{ docker_apt_gpg_key }}"