diff --git a/roles/docker/tasks/Ubuntu.yml b/roles/docker/tasks/Ubuntu.yml
index 53ea490..92751ce 100644
--- a/roles/docker/tasks/Ubuntu.yml
+++ b/roles/docker/tasks/Ubuntu.yml
@@ -1,7 +1,7 @@
 - name: Ensure requirements installed
   ansible.builtin.package:
     name: "{{ requisites }}"
-    state: present
+    state: latest
     update_cache: yes
   tags:
     - apt
@@ -11,11 +11,14 @@
 
 - name: Ensure docker GPG apt key exists
   apt_key:
-    url: https://download.docker.com/linux/ubuntu/gpg
+    url: "https://download.docker.com/linux/ubuntu/gpg"
     state: present
   tags:
     - apt
     - repository
+  # FIXME: Needs a 'until:' defined for the retries to actually work
+  retries: 3
+  delay: 5
   become: true
 
 - name: Ensure docker repository exists
@@ -40,7 +43,7 @@
 
 - name: Ensure docker requisites for python installed
   pip:
-    name: 
+    name:
       - docker
       - jsondiff
       - pyyaml