diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 108d520..8f29072 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -39,11 +39,12 @@
 - name: Create Docker Container
   docker_container:
     name: "{{ name }}"
+    recreate: true
+    restart_policy: unless-stopped
+    published_ports: "{{ published_ports | default(omit) }}"
     network_mode: "{{ network_mode | default(omit) }}"
     image: "{{ image.name }}:{{ image.tag }}"
     command: "{{ command | default(omit) }}"
-    recreate: true
-    restart_policy: unless-stopped
     networks: "{{ networks }}"
     volumes: "{{ volumes | default(omit) }}"
     env: "{{ env | default(omit) }}"
diff --git a/tasks/pihole.yml b/tasks/pihole.yml
index 4e65a89..40ec295 100644
--- a/tasks/pihole.yml
+++ b/tasks/pihole.yml
@@ -1,28 +1,17 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/pihole"
-
-- name: Pull latest PiHole Docker Image
-  docker_image:
-    name: pihole/pihole
-    tag: latest
-    source: pull
-
-- name: Create PiHole Docker Container
-  docker_container:
+- name: Deploy PiHole
+  include_role:
+    name: docker
+  vars:
     name: pihole
-    image: pihole/pihole:latest
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: pihole/pihole
+      tag: latest
+    published_ports:
+      - "53:53/tcp"
+      - "53:53/udp"
     networks:
       - name: homelab
-    published_ports:
-      - "{{ TRAEFIK_HOST_IP }}:53:53/tcp"
-      - "{{ TRAEFIK_HOST_IP }}:53:53/udp"
     volumes:
       - "{{ data_dir }}/pihole:/etc/pihole"
     env: