diff --git a/tasks/configure.yml b/tasks/configure.yml
index 9315567..b1671e1 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -34,5 +34,3 @@
     src: docker.j2.service
     dest: /etc/systemd/system/docker.service
   notify: restart docker
-
-
diff --git a/tasks/install.yml b/tasks/install.yml
index 6810d29..55cdbd2 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -3,9 +3,9 @@
   package:
     name: "{{ item }}"
     state: present
-  register: _dependencies_install
-  retries: 2
-  until: _dependencies_install | success
+  register: __ret
+  retries: 5
+  until: __ret is succeeded
   with_items: "{{ docker_dependencies }}"
 
 - name: remove old versions
@@ -19,17 +19,8 @@
     - docker.io
 
 - block:
-#  - name: download GPG key
-#    get_url:
-#      url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
-#      dest: "/tmp/docker_{{ ansible_distribution | lower }}.gpg"
-#    become: no
-#    run_once: true
-#    delegate_to: localhost
-
   - name: add GPG key
     apt_key:
-      #data: "{{ lookup('file', '/tmp/docker_{{ ansible_distribution | lower }}.gpg') }}"
       url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
       state: present
 
@@ -64,5 +55,3 @@
     name: docker-py
     version: 1.9.0
   when: dockerpy
-
-
diff --git a/tests/test_default.py b/tests/test_default.py
index 5e6a256..3201251 100644
--- a/tests/test_default.py
+++ b/tests/test_default.py
@@ -46,9 +46,4 @@ def test_service(host):
 
 
 def test_packages(host):
-    if host.system_info.distribution == 'ol':
-        DOCKER = 'docker-engine'
-    else:
-        DOCKER = 'docker-ce'
-
-    assert host.package(DOCKER).is_installed
+    assert host.package('docker-ce').is_installed