diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml
index eb4897571..6befdd97e 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -2,19 +2,17 @@
 docker_kernel_min_version: '0'
 
 # https://docs.docker.com/install/linux/docker-ce/fedora/
-# https://download.docker.com/linux/fedora/28/x86_64/stable/Packages/
+# https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
 
 docker_versioned_pkg:
   'latest': docker-ce
-  '18.03': docker-ce-18.03.1.ce-3.fc28
-  '18.06': docker-ce-18.06.2.ce-3.fc28
-  '18.09': docker-ce-18.09.7-3.fc28
+  '18.03': docker-ce-18.03.1.ce-3.fc{{ ansible_distribution_major_version }}
+  '18.06': docker-ce-18.06.2.ce-3.fc{{ ansible_distribution_major_version }}
+  '18.09': docker-ce-18.09.7-3.fc{{ ansible_distribution_major_version }}
+  '19.03': docker-ce-19.03.8-3.fc{{ ansible_distribution_major_version }}
 
-#
-# This is due to the fact that the docker
-# packages available on Fedora are too recent
-#
-docker_version: "latest"
+# Fedora 30/31 don't provide packages for docker 18.0x ...
+docker_version: "19.03"
 
 docker_package_info:
   pkg_mgr: dnf