diff --git a/defaults/main.yml b/defaults/main.yml
index e7288f9..25eb93d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,7 +8,6 @@ ece_installer_url: "https://download.elastic.co/cloud/elastic-cloud-enterprise.s
 ece_runner_id: "{{ ansible_default_ipv4.address }}"
 
 # Overall setup variables (like package versions)
-docker_version: "18.09"
 device_name: xvdb
 data_dir: /mnt/data
 force_xfc: false
diff --git a/tasks/base/CentOS-7/install_Docker-CE.yml b/tasks/base/CentOS-7/install_Docker-CE.yml
deleted file mode 100755
index d093f23..0000000
--- a/tasks/base/CentOS-7/install_Docker-CE.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Add Docker GPG Key
-  rpm_key:
-    key: "{{ docker_version_map[docker_version]['keys']['server']}}"
-    state: present
-
-- name: Add docker repository
-  yum_repository:
-    name: "{{ docker_version_map[docker_version]['name'] }}"
-    description: "Docker repository"
-    file: docker-ce
-    baseurl: "{{ docker_version_map[docker_version]['repo'] }}"
-    enabled: yes
-    gpgcheck: no
-  register: repo_installed
-  retries: 10
-  delay: 30
-  until: repo_installed is success
-
-- name: Install docker
-  package:
-    name: "{{ docker_version_map[docker_version]['package'] }}"
-    state: present
diff --git a/tasks/base/CentOS-7/install_Docker-CS.yml b/tasks/base/CentOS-7/install_Docker-CS.yml
deleted file mode 100755
index fb6cff3..0000000
--- a/tasks/base/CentOS-7/install_Docker-CS.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: disable SELinux
-  selinux:
-    state: disabled
-
-- name: Add Docker GPG Key
-  rpm_key:
-    key: "{{ docker_version_map[docker_version]['keys']['server']}}"
-    state: present
-
-- name: Add docker repository
-  yum_repository:
-    name: "{{ docker_version_map[docker_version]['name'] }}"
-    description: "Docker repository"
-    file: docker-ce
-    baseurl: "{{ docker_version_map[docker_version]['repo'] }}"
-    enabled: yes
-    gpgcheck: no
-  register: repo_installed
-  retries: 10
-  delay: 30
-  until: repo_installed is success
-
-- name: Install docker
-  package:
-    name: "{{ docker_version_map[docker_version]['package'] }}"
-    state: present
diff --git a/tasks/base/CentOS-7/install_docker.yml b/tasks/base/CentOS-7/install_docker.yml
index e0e354b..517c79d 100644
--- a/tasks/base/CentOS-7/install_docker.yml
+++ b/tasks/base/CentOS-7/install_docker.yml
@@ -11,5 +11,25 @@
   delay: 30
   until: remove_packages is success
 
-- name: install specific version of docker
-  include_tasks: "install_{{ docker_version_map[docker_version]['name'] }}.yml"
+- name: Add Docker GPG Key
+  rpm_key:
+    key: "{{ docker_version_map[docker_version]['keys']['server']}}"
+    state: present
+
+- name: Add docker repository
+  yum_repository:
+    name: "{{ docker_version_map[docker_version]['name'] }}"
+    description: "Docker repository"
+    file: docker-ce
+    baseurl: "{{ docker_version_map[docker_version]['repo'] }}"
+    enabled: yes
+    gpgcheck: no
+  register: repo_installed
+  retries: 10
+  delay: 30
+  until: repo_installed is success
+
+- name: Install docker
+  package:
+    name: "{{ docker_version_map[docker_version]['package'] }}"
+    state: present
diff --git a/tasks/base/RedHat-7/install_docker.yml b/tasks/base/RedHat-7/install_docker.yml
index 8949179..780e3fc 100755
--- a/tasks/base/RedHat-7/install_docker.yml
+++ b/tasks/base/RedHat-7/install_docker.yml
@@ -15,26 +15,6 @@
   selinux:
     state: disabled
 
-- name: Add Docker GPG Key
-  rpm_key:
-    key: https://download.docker.com/linux/centos/gpg
-    state: present
-  when: docker_version == '18.09'
-
-- name: Add docker repository
-  yum_repository:
-    name: "{{ docker_version_map[docker_version]['name'] }}"
-    description: "Docker repository"
-    file: docker-ce
-    baseurl: https://download.docker.com/linux/centos/7/x86_64/stable
-    enabled: yes
-    gpgcheck: no
-  when: docker_version == '18.09'
-  register: repo_installed
-  retries: 10
-  delay: 30
-  until: repo_installed is success
-
 - name: Add RHEL7 Extras repository
   shell: yum-config-manager --enable "{{ docker_version_map[docker_version]['repo'] }}"
   register: repo_installed
diff --git a/tasks/base/RedHat-8/install_dependencies.yml b/tasks/base/RedHat-8/install_dependencies.yml
index 2243eb5..c9a6c91 100755
--- a/tasks/base/RedHat-8/install_dependencies.yml
+++ b/tasks/base/RedHat-8/install_dependencies.yml
@@ -5,3 +5,4 @@
     state: present
   with_items:
   - lvm2
+  - iptables
diff --git a/tasks/base/main.yml b/tasks/base/main.yml
index fe42173..98266a5 100755
--- a/tasks/base/main.yml
+++ b/tasks/base/main.yml
@@ -10,6 +10,10 @@
     msg: "ERROR: OS {{ ansible_distribution }} {{ ansible_distribution_major_version}} is not supported!"
   when: unsupported_version is defined and unsupported_version
 
+- name: Set docker version
+  set_fact:
+    docker_version: "{{ docker_version | default(docker_version_map.keys()|list|last) }}"
+
 - name: Assert docker version is supported
   assert:
     that: "docker_version in docker_version_map.keys()"
diff --git a/vars/os_CentOS_7.yml b/vars/os_CentOS_7.yml
index ac708a1..43eb843 100644
--- a/vars/os_CentOS_7.yml
+++ b/vars/os_CentOS_7.yml
@@ -5,12 +5,6 @@ bootloader_update_command: grub2-mkconfig
 
 # Docker version mapping
 docker_version_map:
-  "1.13":
-    name: 'Docker-CS'
-    package: docker-1.13.1-108*
-    repo: https://packages.docker.com/1.13/yum/repo/main/centos/7
-    keys:
-      server: https://packages.docker.com/1.13/yum/gpg
   "18.09":
     name: 'Docker-CE'
     package:
diff --git a/vars/os_CentOS_8.yml b/vars/os_CentOS_8.yml
index 8b32652..9576de7 100644
--- a/vars/os_CentOS_8.yml
+++ b/vars/os_CentOS_8.yml
@@ -8,8 +8,8 @@ docker_version_map:
   "19.03":
     name: 'Docker-CE'
     package:
-      - docker-ce-19.03.12
-      - docker-ce-cli-19.03.12
+      - docker-ce-19.03.13
+      - docker-ce-cli-19.03.13
       - containerd.io
     repo: https://download.docker.com/linux/centos/docker-ce.repo
     keys:
diff --git a/vars/os_RedHat_7.yml b/vars/os_RedHat_7.yml
index 893ed3a..86fde2e 100644
--- a/vars/os_RedHat_7.yml
+++ b/vars/os_RedHat_7.yml
@@ -9,10 +9,3 @@ docker_version_map:
     name: 'Docker'
     package: docker-2:1.13.1-109*
     repo: "Red Hat Enterprise Linux*7*Extra*RPMs)"
-  "18.09":
-    name: 'Docker-CE'
-    package: docker-ce-18.09.3
-    repo: https://download.docker.com/linux/centos/docker-ce.repo
-    keys:
-      server: https://download.docker.com/linux/centos/gpg
-      id: 060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35
diff --git a/vars/os_RedHat_8.yml b/vars/os_RedHat_8.yml
index 8b32652..9576de7 100644
--- a/vars/os_RedHat_8.yml
+++ b/vars/os_RedHat_8.yml
@@ -8,8 +8,8 @@ docker_version_map:
   "19.03":
     name: 'Docker-CE'
     package:
-      - docker-ce-19.03.12
-      - docker-ce-cli-19.03.12
+      - docker-ce-19.03.13
+      - docker-ce-cli-19.03.13
       - containerd.io
     repo: https://download.docker.com/linux/centos/docker-ce.repo
     keys:
diff --git a/vars/os_Ubuntu_18.yml b/vars/os_Ubuntu_18.yml
index 45952b9..e02d751 100755
--- a/vars/os_Ubuntu_18.yml
+++ b/vars/os_Ubuntu_18.yml
@@ -7,8 +7,8 @@ bootloader_update_command: update-grub
 docker_version_map:
   "19.03":
     package:
-      - docker-ce=5:19.03.11*
-      - docker-ce-cli=5:19.03.11*
+      - docker-ce=5:19.03.13*
+      - docker-ce-cli=5:19.03.13*
       - containerd.io
     repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable
     keys: