diff --git a/Apps/EmulatorJS/docker-compose.yml b/Apps/EmulatorJS/docker-compose.yml
index 977f680..4ee2876 100644
--- a/Apps/EmulatorJS/docker-compose.yml
+++ b/Apps/EmulatorJS/docker-compose.yml
@@ -2,12 +2,12 @@ name: emulatorjs
 services:
   emulatorjs:
     environment:
-      - PGID=1000
-      - PUID=1000
+      - PGID=$PGID
+      - PUID=$PUID
       - SUBFOLDER=/
-      - TZ=Etc/UTC
+      - TZ=$TZ
     image: lscr.io/linuxserver/emulatorjs:1.7.2
-    network_mode: data_default
+    network_mode: bridge
     ports:
       - target: 3000
         published: "3001"
diff --git a/Apps/Handbrake/docker-compose.yml b/Apps/Handbrake/docker-compose.yml
index 8be9a64..e5ab5a0 100644
--- a/Apps/Handbrake/docker-compose.yml
+++ b/Apps/Handbrake/docker-compose.yml
@@ -20,10 +20,7 @@ services:
         source: /DATA/Media
         target: /output
       - type: bind
-        source: /var/lib/docker/volumes/600fc8152964f5086ca729ef43181c2486230387bc84beff1951ebdc969850c9/_data
-        target: /trash
-      - type: bind
-        source: /DATA/AppData/HandBrake/config
+        source: /DATA/AppData/$AppID/config
         target: /config
 x-casaos:
   architectures:
diff --git a/Apps/Resilio-sync/docker-compose.yml b/Apps/Resilio-sync/docker-compose.yml
index abcd634..0a34ee8 100644
--- a/Apps/Resilio-sync/docker-compose.yml
+++ b/Apps/Resilio-sync/docker-compose.yml
@@ -2,11 +2,11 @@ name: resilio-sync
 services:
   resilio-sync:
     environment:
-      - PGID=1000
-      - PUID=1000
-      - TZ=Etc/UTC
+      - PGID=$PGID
+      - PUID=$PUID
+      - TZ=$TZ
     image: lscr.io/linuxserver/resilio-sync:2.7.3
-    network_mode: data_default
+    network_mode: bridge
     ports:
       - target: 55555
         published: "55555"
diff --git a/Apps/Snapdrop/docker-compose.yml b/Apps/Snapdrop/docker-compose.yml
index b2f05dc..ef019e1 100644
--- a/Apps/Snapdrop/docker-compose.yml
+++ b/Apps/Snapdrop/docker-compose.yml
@@ -2,11 +2,11 @@ name: snapdrop
 services:
   snapdrop:
     environment:
-      - PGID=1000
-      - PUID=1000
-      - TZ=Etc/UTC
+      - PGID=$PGID
+      - PUID=$PUID
+      - TZ=$TZ
     image: lscr.io/linuxserver/snapdrop:version-eac78009
-    network_mode: data_default
+    network_mode: bridge
     ports:
       - target: 443
         published: "443"