diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
new file mode 100644
index 0000000..b6f5b6b
--- /dev/null
+++ b/roles/docker/handlers/main.yml
@@ -0,0 +1,22 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+---
+- name: Docker Restart
+  become: yes
+  service:
+    name=docker
+    state=restarted
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index ce0e90b..9419661 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -29,24 +29,8 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: Docker Exposed via TCP
-  become: yes
-  lineinfile:
-    dest=/etc/default/docker
-    state=present
-    insertafter='#DOCKER_OPTS'
-    line='DOCKER_OPTS="-H unix:///var/run/docker.sock"'
-  register: docker_config
-
-- name: Docker Restart
-  become: yes
-  service:
-    name=docker
-    state=restarted
-  when: docker_config.changed
-
 # docker fails without docker-py, docker-compose >1.9 fails with docker-py installed
-- name: Install docker-compose and docker-py
+- name: Install docker-compose
   become: yes
   pip:
     name: "{{ item }}"