diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index 3242630..c3ef85c 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -37,13 +37,13 @@
     state: present
     update_cache: true
 
-- name: get docker-version from apt
+- name: Get docker-version from apt
   shell: apt-cache madison docker-{{ docker_edition }} | grep -P '{{ docker_version }}~{{ docker_edition }}~[^\s]*' -o
   register: apt_docker_version_register
   when: docker_version != ""
   changed_when: false
 
-- name: set fact for docker version
+- name: Set fact for docker version
   set_fact:
     docker_package_version: "={{ apt_docker_version_register.stdout_lines[0] }}"
   when: apt_docker_version_register is not skipped and apt_docker_version_register.rc == 0
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index c02a5fd..90b7b87 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -34,13 +34,21 @@
     option: enabled
     value: '{{ docker_yum_repo_enable_test }}'
 
-- name: get docker-version from yum
-  shell: yum list docker-{{ docker_edition }} --showduplicates  | grep -P '{{ docker_version }}.{{ docker_edition }}[^\s]*' -o
+- name: Get docker-version from yum
+  yum:
+    list: docker-{{ docker_edition }}
   register: yum_docker_version_register
   when: docker_version != ""
   changed_when: false
 
-- name: set fact for docker version
+
+- debug: var=yum_docker_version_register
+- debug: msg='{{docker_version}}.{{ docker_edition }}'
+
+- name: Set fact for docker version
   set_fact:
-    docker_package_version: "-{{ yum_docker_version_register.stdout_lines[0] }}"
-  when: yum_docker_version_register is not skipped and yum_docker_version_register.rc == 0
+    docker_package_version: "-{{ item.version }}-{{ item.release}}"
+  with_items: "{{yum_docker_version_register.results}}"
+  when: yum_docker_version_register is not skipped and yum_docker_version_register.failed == false and item.version == '{{docker_version}}.{{ docker_edition }}'
+
+- debug: var=docker_package_version