diff --git a/handlers/main.yml b/handlers/main.yml
index ad14b35..5c5cb07 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,3 +4,8 @@
     name: rexray
     state: restarted
   when: rexray_service
+
+- name: restart docker
+  systemd:
+      name: docker
+      state: restarted
diff --git a/tasks/docker.yml b/tasks/docker.yml
new file mode 100644
index 0000000..afed4b3
--- /dev/null
+++ b/tasks/docker.yml
@@ -0,0 +1,13 @@
+---
+
+- name: Create Docker plug-ins folder
+  file:
+    path: /etc/docker/plug-ins
+    state: directory
+
+- name: Add docker config file
+  template:
+    src: docker.spec.j2
+    dest: /etc/docker/plug-ins/rexray.spec
+  notify:
+    - restart docker
diff --git a/tasks/main.yml b/tasks/main.yml
index ad4f53c..9305bb4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,3 +18,6 @@
     name: rexray
     state: started
   when: rexray_service
+
+- include: docker.yml
+  when: rexray_docker is defined
diff --git a/templates/config.yml.j2 b/templates/config.yml.j2
index a915b6e..14c22ab 100644
--- a/templates/config.yml.j2
+++ b/templates/config.yml.j2
@@ -1,5 +1,10 @@
 # {{ ansible_managed }}
 rexray:
+{% if rexray_docker is defined %}
+  modules:
+    default-docker:
+      host: tcp://:7981
+{% endif %}
   logLevel: {{ rexray_log_level }}
 libstorage:
   service: {{ rexray_storage_drivers[0] }}
diff --git a/templates/docker.spec.j2 b/templates/docker.spec.j2
new file mode 100644
index 0000000..2561773
--- /dev/null
+++ b/templates/docker.spec.j2
@@ -0,0 +1 @@
+tcp://{{ ansible_default_ipv4.address }}:7981
diff --git a/vars/main.yml b/vars/main.yml
index a304685..c1fb613 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -61,3 +61,6 @@ rexray_vbox_tls: false
 rexray_vbox_volume_path: ''
 rexray_vbox_controller_name: SATA
 #rexray_vbox_machine: ''
+
+# Docker
+rexray_docker: false