diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml
index a7d753b..19cf69b 100644
--- a/docker/mumble/docker-compose.yaml
+++ b/docker/mumble/docker-compose.yaml
@@ -6,6 +6,8 @@ services:
     image: phlak/mumble
     environment:
       - TZ=Europe/Helsinki
+      - PUID=${UID}
+      - PGID=${GID}
     ports:
       - '64748:64738'
       - '64748:64738/udp'
diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml
index a8024be..d2211ca 100644
--- a/docker/tvheadend/docker-compose.yaml
+++ b/docker/tvheadend/docker-compose.yaml
@@ -5,8 +5,8 @@ services:
     container_name: tvheadend
     environment:
       - TZ=Europe/Helsinki
-      - PUID=1001
-      - PGID=985
+      - PUID=${UID}
+      - PGID=${GID}
     volumes:
       - /docker/tvheadend:/config
       - /mnt/Storage/Media/PVR:/recordings