diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 39ed48a..108d520 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -39,6 +39,7 @@
 - name: Create Docker Container
   docker_container:
     name: "{{ name }}"
+    network_mode: "{{ network_mode | default(omit) }}"
     image: "{{ image.name }}:{{ image.tag }}"
     command: "{{ command | default(omit) }}"
     recreate: true
diff --git a/tasks/homebridge.yml b/tasks/homebridge.yml
index d1ff366..e6f3c11 100644
--- a/tasks/homebridge.yml
+++ b/tasks/homebridge.yml
@@ -1,24 +1,13 @@
 ---
-- name: Create Folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/homebridge"
-
-- name: Pull latest Homebridge Docker Image
-  docker_image:
-    name: homebridge/homebridge
-    tag: latest
-    source: pull
-
-- name: Create Homebridge Docker Container
-  docker_container:
+- name: Deploy Homebridge
+  include_role:
+    name: docker
+  vars:
     name: homebridge
-    image: homebridge/homebridge:latest
-    restart_policy: unless-stopped
+    image:
+      name: homebridge/homebridge
+      tag: latest
     network_mode: host
-    recreate: true
     volumes:
       - "{{ data_dir }}/homebridge:/homebridge"
     labels: