diff --git a/docker-compose.yml b/docker-compose.yml
index a48de27..cb58432 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -498,7 +498,7 @@ services:
 
 # Monitoring
   speedtest-exporter:
-    image: jraviles/prometheus_speedtest:latest
+    image: miguelndecarvalho/speedtest-exporter:latest
     container_name: speedtest-exporter
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
@@ -575,8 +575,8 @@ services:
     restart: always
 
   blackbox_exporter:
-    image: prom/blackbox-exporter
-    container_name: blackbox-exporter:latest
+    image: prom/blackbox-exporter:latest
+    container_name: blackbox-exporter
     command:
       - '--config.file=/etc/blackboxexporter/config.yml'
     labels:
@@ -618,8 +618,7 @@ services:
     environment:
       TZ: 'Australia/Melbourne'
       WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c'
-      DNS1: '192.168.0.2'
-      DNS2: '208.67.222.222'
+      PIHOLE_DNS_: '208.67.222.222;208.67.220.220'
     volumes:
       - /srv/docker/container/pihole/etc/:/etc/pihole/
       - /srv/docker/container/pihole/dnsmasq.d/:/etc/dnsmasq.d/
@@ -628,11 +627,13 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
-      - "traefik.http.routers.pihole.rule=PathPrefix(`/pihole/`)"
+      - "traefik.http.routers.pihole.rule=PathPrefix(`/pihole/`) || PathPrefix(`/admin/`)"
       - "traefik.http.routers.pihole.entrypoints=web"
+      - "traefik.http.middlewares.replaceprefix-pihole.replacepathregex.regex=^/admin/$$"
+      - "traefik.http.middlewares.replaceprefix-pihole.replacepathregex.replacement=/pihole/admin/"
       - "traefik.http.middlewares.stripprefix-pihole.stripprefix.prefixes=/pihole"
       - "traefik.http.services.pihole.loadbalancer.server.port=80"
-      - "traefik.http.routers.pihole.middlewares=stripprefix-pihole@docker"
+      - "traefik.http.routers.pihole.middlewares=replaceprefix-pihole@docker,stripprefix-pihole@docker"
 
   bookdb_dev:
     container_name: bookdb_dev