diff --git a/roles/docker_storage_verify/tasks/main.yml b/roles/docker_storage_verify/tasks/main.yml
index 85642f0..f810278 100644
--- a/roles/docker_storage_verify/tasks/main.yml
+++ b/roles/docker_storage_verify/tasks/main.yml
@@ -1,33 +1,19 @@
 ---
 # vim: set ft=ansible:
 #
-- name: Include distribution vars
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}.yml"
-    - "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version }}.yml"
-    - "{{ ansible_distribution|lower }}.yml"
+- name: Set storage driver
+  set_fact:
+    storage_driver: 'overlay2'
 
-- name: Fail if required variables are not defined
-  when: driver is undefined
-  fail:
-    msg: "The required variables are not defined.  Check files under roles/docker_storage_verify/vars"
+- name: Set storage driver for CAHC
+  when: ansible_distribution == 'CentOSDev'
+  set_fact:
+    storage_driver: 'devicemapper'
 
-  # When all the streams are on docker 1.13, we should start using
-  #  docker info --format  '{{.Driver}}'
 - name: Check Docker storage driver
-  shell: "docker info | grep -oP '(?<=Storage Driver: ).*'"
-  register: storage_driver
-  failed_when: storage_driver.stdout != driver
+  command: "docker info --format {% raw %}{{.Driver}}{% endraw %}"
+  register: di
+  failed_when: "di.stdout != storage_driver"
 
-- name: Check for F26 Docker mount
-  when:
-    - ansible_distribution == 'Fedora'
-    - ansible_distribution_major_version == '26'
-  command: findmnt /var/lib/docker
-
-- name: Check for Fedora Rawhide Docker mount
-  when:
-    - ansible_distribution == 'Fedora'
-    - ansible_distribution_major_version > '26'
+- name: Check for Docker mount
   command: findmnt /var/lib/docker/containers
diff --git a/roles/docker_storage_verify/vars/centos-7.yml b/roles/docker_storage_verify/vars/centos-7.yml
deleted file mode 120000
index 9e3b3f5..0000000
--- a/roles/docker_storage_verify/vars/centos-7.yml
+++ /dev/null
@@ -1 +0,0 @@
-devicemapper.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/centos.yml b/roles/docker_storage_verify/vars/centos.yml
deleted file mode 120000
index 9e3b3f5..0000000
--- a/roles/docker_storage_verify/vars/centos.yml
+++ /dev/null
@@ -1 +0,0 @@
-devicemapper.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/centosdev-7.yml b/roles/docker_storage_verify/vars/centosdev-7.yml
deleted file mode 120000
index 9e3b3f5..0000000
--- a/roles/docker_storage_verify/vars/centosdev-7.yml
+++ /dev/null
@@ -1 +0,0 @@
-devicemapper.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/devicemapper.yml b/roles/docker_storage_verify/vars/devicemapper.yml
deleted file mode 100644
index 193b7d1..0000000
--- a/roles/docker_storage_verify/vars/devicemapper.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# vim: set ft=ansible:
-driver: 'devicemapper'
diff --git a/roles/docker_storage_verify/vars/fedora-26.yml b/roles/docker_storage_verify/vars/fedora-26.yml
deleted file mode 120000
index 4dc92bf..0000000
--- a/roles/docker_storage_verify/vars/fedora-26.yml
+++ /dev/null
@@ -1 +0,0 @@
-overlay2.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/fedora-27.yml b/roles/docker_storage_verify/vars/fedora-27.yml
deleted file mode 120000
index 4dc92bf..0000000
--- a/roles/docker_storage_verify/vars/fedora-27.yml
+++ /dev/null
@@ -1 +0,0 @@
-overlay2.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/fedora-28.yml b/roles/docker_storage_verify/vars/fedora-28.yml
deleted file mode 120000
index 4dc92bf..0000000
--- a/roles/docker_storage_verify/vars/fedora-28.yml
+++ /dev/null
@@ -1 +0,0 @@
-overlay2.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/fedora-29.yml b/roles/docker_storage_verify/vars/fedora-29.yml
deleted file mode 120000
index 4dc92bf..0000000
--- a/roles/docker_storage_verify/vars/fedora-29.yml
+++ /dev/null
@@ -1 +0,0 @@
-overlay2.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/overlay2.yml b/roles/docker_storage_verify/vars/overlay2.yml
deleted file mode 100644
index 7dd9869..0000000
--- a/roles/docker_storage_verify/vars/overlay2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# vim: set ft=ansible:
-driver: 'overlay2'
diff --git a/roles/docker_storage_verify/vars/redhat-3.yml b/roles/docker_storage_verify/vars/redhat-3.yml
deleted file mode 100644
index 7dd9869..0000000
--- a/roles/docker_storage_verify/vars/redhat-3.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# vim: set ft=ansible:
-driver: 'overlay2'
diff --git a/roles/docker_storage_verify/vars/redhat-7.5.yml b/roles/docker_storage_verify/vars/redhat-7.5.yml
deleted file mode 120000
index 4dc92bf..0000000
--- a/roles/docker_storage_verify/vars/redhat-7.5.yml
+++ /dev/null
@@ -1 +0,0 @@
-overlay2.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/redhat-7.yml b/roles/docker_storage_verify/vars/redhat-7.yml
deleted file mode 120000
index 9e3b3f5..0000000
--- a/roles/docker_storage_verify/vars/redhat-7.yml
+++ /dev/null
@@ -1 +0,0 @@
-devicemapper.yml
\ No newline at end of file
diff --git a/roles/docker_storage_verify/vars/redhat.yml b/roles/docker_storage_verify/vars/redhat.yml
deleted file mode 120000
index 9e3b3f5..0000000
--- a/roles/docker_storage_verify/vars/redhat.yml
+++ /dev/null
@@ -1 +0,0 @@
-devicemapper.yml
\ No newline at end of file