diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index e8d947d..035d853 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -21,21 +21,14 @@
     service: name=docker state=started
     tags: docker-storage
 
- # TODO : on fresh install, run docker-storage-setup inconditionally
-
-
   - name: Determine if docker storage driver == devicemapper
-    shell: docker info | grep 'Storage Driver:.*devicemapper'
-    register: correct_storage_driver
+    shell: docker info
+    register: docker_info
     changed_when: false
-    ignore_errors: yes
-
-  - debug:
-      var: correct_storage_driver
 
   - name: set docker_storage_setup_needs_to_run
     set_fact:
-      docker_storage_setup_needs_to_run: '{{ correct_storage_driver.rc == 1 }}'
+      docker_storage_setup_needs_to_run: '{{ docker_info.stdout.find(''Storage Driver: devicemapper'') == -1 or docker_info.stdout.find(''Data file: /dev/loop'') != -1 }}'
     tags: docker-storage
 
   - name: stop docker