diff --git a/docs/portainer-stacks/Dillinger.md b/docs/portainer-stacks/Dillinger.md
new file mode 100644
index 0000000..0c53863
--- /dev/null
+++ b/docs/portainer-stacks/Dillinger.md
@@ -0,0 +1,23 @@
+Portainer Stack:
+```yaml
+---
+version: "3.8"
+services:
+  dillinger:
+    image: lscr.io/linuxserver/dillinger:latest
+    container_name: dillinger
+    environment:
+      - PUID="${PUID-1000}"
+      - PGID="${GID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
+    volumes:
+      - dillinger:/config
+    ports:
+      - 8080:8080
+    restart: unless-stopped
+    labels:
+      - com.centurylinklabs.watchtower.enable=true
+
+volumes:
+  dillinger:
+```
\ No newline at end of file
diff --git a/docs/portainer-stacks/Gitea.md b/docs/portainer-stacks/Gitea.md
index 6d1b58e..f22d43a 100644
--- a/docs/portainer-stacks/Gitea.md
+++ b/docs/portainer-stacks/Gitea.md
@@ -7,8 +7,8 @@ services:
     image: gitea/gitea:latest
     container_name: gitea
     environment:
-      - USER_UID=1000
-      - USER_GID=1000
+      - USER_UID="${PUID-1000}"
+      - USER_GID=${PGID-1000}"
       - GITEA__database__HOST=gitea_db:3306
       - GITEA__database__NAME=db_name
       - GITEA__database__USER=db_username
@@ -29,10 +29,10 @@ services:
     image: lscr.io/linuxserver/mariadb:latest
     container_name: gitea_db
     environment:
-      - PUID=1000
-      - PGID=1000
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
       - MYSQL_ROOT_PASSWORD=db_root_password
-      - TZ=Europe/Amsterdam
+      - TZ="${TZ-Europe/Amsterdam}"
       - MYSQL_DATABASE=db_name
       - MYSQL_USER=db_username
       - MYSQL_PASSWORD=db_password
diff --git a/docs/portainer-stacks/Librespeed.md b/docs/portainer-stacks/Librespeed.md
index 6d2b7ca..8695377 100644
--- a/docs/portainer-stacks/Librespeed.md
+++ b/docs/portainer-stacks/Librespeed.md
@@ -8,9 +8,9 @@ services:
     container_name: librespeed
     network_mode: bridge
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
       - PASSWORD=
       - CUSTOM_RESULTS=false
     volumes:
diff --git a/docs/portainer-stacks/MQTT-Mosquitto.md b/docs/portainer-stacks/MQTT-Mosquitto.md
index b60f363..88c5683 100644
--- a/docs/portainer-stacks/MQTT-Mosquitto.md
+++ b/docs/portainer-stacks/MQTT-Mosquitto.md
@@ -11,7 +11,7 @@ services:
     network_mode: bridge
     user: "1000:1000"
     environment:
-      - TZ=Europe/Amsterdam
+      - TZ="${TZ-Europe/Amsterdam}"
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /mqtt/config:/mosquitto/config
diff --git a/docs/portainer-stacks/PhotoView.md b/docs/portainer-stacks/PhotoView.md
index 42a0f3c..a8d2738 100644
--- a/docs/portainer-stacks/PhotoView.md
+++ b/docs/portainer-stacks/PhotoView.md
@@ -42,9 +42,9 @@ services:
     image: lscr.io/linuxserver/mariadb:latest
     restart: unless-stopped
     environment:
-      - TZ=Europe/Amsterdam
-      - PGID=1000
-      - PUID=1000
+      - TZ="${TZ-Europe/Amsterdam}"
+      - PGID="${PGID-1000}"
+      - PUID="${PUID-1000}"
       - MYSQL_DATABASE=photoview
       - MYSQL_USER=photoview
       - MYSQL_PASSWORD=photosecret
diff --git a/docs/portainer-stacks/VSCode.md b/docs/portainer-stacks/VSCode.md
index 07cbdb8..8a409ee 100644
--- a/docs/portainer-stacks/VSCode.md
+++ b/docs/portainer-stacks/VSCode.md
@@ -7,9 +7,9 @@ services:
     image: lscr.io/linuxserver/code-server:latest
     container_name: vscode
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
       - SUDO_PASSWORD=
       - PASSWORD=
       - PROXY_DOMAIN=
diff --git a/docs/portainer-stacks/Zigbee2MQTT.md b/docs/portainer-stacks/Zigbee2MQTT.md
index c3121af..454d356 100644
--- a/docs/portainer-stacks/Zigbee2MQTT.md
+++ b/docs/portainer-stacks/Zigbee2MQTT.md
@@ -15,7 +15,7 @@ services:
     network_mode: host
     privileged: true
     environment:
-      - TZ=Europe/Amsterdam
+      - TZ="${TZ-Europe/Amsterdam}"
     labels:
       - com.centurylinklabs.watchtower.enable=true
       - hide_container=false
diff --git a/docs/portainer-stacks/authelia.md b/docs/portainer-stacks/authelia.md
index 6411a28..be312b3 100644
--- a/docs/portainer-stacks/authelia.md
+++ b/docs/portainer-stacks/authelia.md
@@ -8,7 +8,7 @@ services:
     container_name: authelia
     network_mode: bridge
     environment:
-      - TZ=Europe/Amsterdam
+      - TZ="${TZ-Europe/Amsterdam}"
     volumes:
       - /docker/nginx/authelia:/config
     restart: unless-stopped
diff --git a/docs/portainer-stacks/bazarr.md b/docs/portainer-stacks/bazarr.md
index b56391a..992e972 100644
--- a/docs/portainer-stacks/bazarr.md
+++ b/docs/portainer-stacks/bazarr.md
@@ -7,10 +7,10 @@ services:
     container_name: bazarr
     network_mode: bridge
     environment:
-      - PUID=1000
-      - PGID=1000
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
       - UMASK_SET=022
-      - TZ=Europe/Amsterdam
     volumes:
       - /htpc/bazarr:/config
       - /media/movies:/movies
diff --git a/docs/portainer-stacks/digiKam.md b/docs/portainer-stacks/digiKam.md
index c56bbce..f8e58f2 100644
--- a/docs/portainer-stacks/digiKam.md
+++ b/docs/portainer-stacks/digiKam.md
@@ -6,11 +6,11 @@ services:
   digikam:
     image: lscr.io/linuxserver/digikam:latest
     container_name: digikam
-    network_mode: host
+    network_mode: bridge
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
       - SUBFOLDER=/
       - KEYBOARD=en-us-qwerty
     volumes:
diff --git a/docs/portainer-stacks/heimdall.md b/docs/portainer-stacks/heimdall.md
index 5c981bc..d6de0bc 100644
--- a/docs/portainer-stacks/heimdall.md
+++ b/docs/portainer-stacks/heimdall.md
@@ -8,9 +8,9 @@ services:
     container_name: heimdall
     network_mode: bridge
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
     volumes:
       - /heimdall:/config
     ports:
diff --git a/docs/portainer-stacks/jellyfin.md b/docs/portainer-stacks/jellyfin.md
index 03a5a06..4d08063 100644
--- a/docs/portainer-stacks/jellyfin.md
+++ b/docs/portainer-stacks/jellyfin.md
@@ -7,9 +7,9 @@ services:
     container_name: jellyfin
     network_mode: bridge
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
 #      - JELLYFIN_PublishedServerUrl=
     volumes:
       - /jellyfin:/config
diff --git a/docs/portainer-stacks/mqtt-explorer.md b/docs/portainer-stacks/mqtt-explorer.md
index 1be806b..6c2f52a 100644
--- a/docs/portainer-stacks/mqtt-explorer.md
+++ b/docs/portainer-stacks/mqtt-explorer.md
@@ -10,9 +10,9 @@ services:
     container_name: mqtt-explorer
     network_mode: bridge
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
       - HTTP_PORT=4000
       - CONFIG_PATH=/mqtt-explorer/config
     volumes:
diff --git a/docs/portainer-stacks/octoprint.md b/docs/portainer-stacks/octoprint.md
index 579543d..bfbeb88 100644
--- a/docs/portainer-stacks/octoprint.md
+++ b/docs/portainer-stacks/octoprint.md
@@ -10,7 +10,7 @@ services:
     container_name: octoprint
     network_mode: bridge
     restart: unless-stopped
-    user: 1000:1000
+    user: "${USER-1000:1000}"
     volumes:
       - octoprint:/octoprint
 #    devices:
diff --git a/docs/portainer-stacks/qbittorrent.md b/docs/portainer-stacks/qbittorrent.md
index a7826e8..552af1c 100644
--- a/docs/portainer-stacks/qbittorrent.md
+++ b/docs/portainer-stacks/qbittorrent.md
@@ -15,9 +15,9 @@ services:
       - "6881:6881/udp"
     restart: always
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
+      - PUID="${PUID-1000}"
+      - PGID="${PGID-1000}"
+      - TZ="${TZ-Europe/Amsterdam}"
       - UMASK=022
       - WEBUI_PORT=8080
     labels:
diff --git a/docs/portainer-stacks/samba.md b/docs/portainer-stacks/samba.md
index 8c1579a..96e810d 100644
--- a/docs/portainer-stacks/samba.md
+++ b/docs/portainer-stacks/samba.md
@@ -22,7 +22,7 @@ services:
     network_mode: bridge
     restart: unless-stopped
     environment:
-      - TZ=Europe/Amsterdam
+      - TZ="${TZ-Europe/Amsterdam}"
     volumes:
       - {folder_to_share}:/share
     ports: