diff --git a/docker-compose.yml b/docker-compose.yml
index 3cf02b0..f42c3f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -87,7 +87,7 @@ services:
       - TZ=Australia/Melbourne
     volumes:
       - /srv/docker/container/emby/config:/config
-      - /srv/docker/container/emby/transcode:/transcode
+      - /export/docker/storage/transcode:/transcode
       - /export/docker/storage:/data
       - /export/myth/tv:/myth-recordings
     ports:
@@ -280,7 +280,7 @@ services:
       - "32469:32469"
 
   hassio:
-    image: homeassistant/amd64-hassio-supervisor:2021.03.4
+    image: homeassistant/amd64-hassio-supervisor:2021.04.0
     container_name: hassio_supervisor
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
@@ -429,10 +429,11 @@ services:
 
   pihole:
     container_name: pihole
-    image: pihole/pihole:latest
+    image: pihole/pihole:v5.7
     ports:
       - "192.168.0.2:53:53/tcp"
       - "192.168.0.2:53:53/udp"
+      - "9999:80"
     environment:
       TZ: 'Australia/Melbourne'
       WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c'
@@ -493,7 +494,11 @@ services:
 
   paweb:
     container_name: paweb
-    build: '/home/ddp/src/photoassistant'
+    build: 
+      context: '/home/ddp/src/photoassistant'
+      args:
+        PJM_UID: 500
+        PJM_GID: 500
     volumes:
       - '/srv/docker/container/letsencrypt/etc:/etc/letsencrypt'
       - '/export/docker/storage:/export/docker/storage'