diff --git a/pihole/compose.yaml b/pihole/compose.yaml
new file mode 100644
index 0000000..2607db6
--- /dev/null
+++ b/pihole/compose.yaml
@@ -0,0 +1,19 @@
+services:
+  pihole:
+    image: ${PIHOLE_IMAGE:-pihole/pihole:latest}
+    restart: unless-stopped
+    volumes:
+      - '${VOL_PATH}/pihole/pihole:/etc/pihole'
+      - '${VOL_PATH}/pihole/dnsmasq:/etc/dnsmasq.d'
+    environment:
+      - TZ=${TZ:-America/Vancouver}
+      - FTLCONF_dns_listeningMode=ALL
+      - FTLCONF_webserver_port=8080o,[::]:8080o,8443os,[::]:8443os
+    network_mode: host
+    cap_add:
+      # See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+      - NET_ADMIN
+      # Required if you are using Pi-hole as your NTP client to be able to set the host's system time
+      - SYS_TIME
+      # Optional, if Pi-hole should get some more processing time
+      - SYS_NICE
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
deleted file mode 100644
index cfbedcf..0000000
--- a/pihole/docker-compose.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-services:
-  pihole:
-    image: ${PIHOLE_IMAGE:-pihole/pihole:latest}
-    restart: unless-stopped
-    volumes:
-      - './etc-pihole:/etc/pihole'
-      - './etc-dnsmasq:/etc/dnsmasq.d'
-    environment:
-      - TZ=${TZ:-America/Vancouver}
-      # Set a password to access the web interface. Not setting one will result in a random password being assigned
-      - FTLCONF_webserver_api_password=${PIHOLE_PASSWORD:-correctHorseBatteryStaple}
-      # If using Docker's default `bridge` network setting the dns listening mode should be set to 'ALL'
-      - FTLCONF_dns_listeningMode=${PIHOLE_LISTENMODE:-ALL}
-    ports:
-      # DNS Ports
-      - "53:53/tcp"
-      - "53:53/udp"
-      # Default HTTP Port
-      - "80:80/tcp"
-      # Default HTTPs Port. FTL will generate a self-signed certificate
-      - "443:443/tcp"
-      # Uncomment the line below if you are using Pi-hole as your DHCP server
-      #- "67:67/udp"
-      # Uncomment the line below if you are using Pi-hole as your NTP server
-      #- "123:123/udp"
-    cap_add:
-      # See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-      # Required if you are using Pi-hole as your DHCP server, else not needed
-      # - NET_ADMIN
-      # Required if you are using Pi-hole as your NTP client to be able to set the host's system time
-      - SYS_TIME
-      # Optional, if Pi-hole should get some more processing time
-      - SYS_NICE
diff --git a/pihole/sample.env b/pihole/sample.env
index c58d6d4..9f45f0d 100644
--- a/pihole/sample.env
+++ b/pihole/sample.env
@@ -1,4 +1,3 @@
 TZ="America/Vancouver"
-PIHOLE_IMAGE="pihole/pihole:latest"
-PIHOLE_PASSWORD="correctHorseBatteryStaple"
-PIHOLE_LISTENMODE="ALL"
+PIHOLE_IMAGE="pihole/pihole:2026.05.0"
+VOL_PATH="/data/"
\ No newline at end of file