diff --git a/monitoring/gotify/docker-compose.yml b/monitoring/gotify/docker-compose.yml
index bad0989..e8927ed 100644
--- a/monitoring/gotify/docker-compose.yml
+++ b/monitoring/gotify/docker-compose.yml
@@ -10,9 +10,9 @@ services:
 
     environment:
       - TZ=${TZ}
-      - GOTIFY_DEFAULTUSER_NAME=admin
-      - GOTIFY_DEFAULTUSER_PASS=R1m@dmin
-      - GOTIFY_REGISTRATION=false
+      - GOTIFY_DEFAULTUSER_NAME=${GOTIFY_DEFAULTUSER_NAME}
+      - GOTIFY_DEFAULTUSER_PASS=${GOTIFY_DEFAULTUSER_PASS}
+      - GOTIFY_REGISTRATION=${GOTIFY_REGISTRATION}
 
     networks:
 #      - traefik_reverse_proxy
diff --git a/monitoring/gotify/docker-health-to-gotify.sh b/monitoring/gotify/docker-health-to-gotify.sh
index fa52b9d..ec8bfdd 100755
--- a/monitoring/gotify/docker-health-to-gotify.sh
+++ b/monitoring/gotify/docker-health-to-gotify.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 #: "${GOTIFY_URL:?Set GOTIFY_URL (e.g. https://gotify.lan.ddnsgeek.com)}"
 #: "${GOTIFY_TOKEN:?Set GOTIFY_TOKEN (AAM..CtNmUGoNIV)}"
 
-GOTIFY_URL="https://gotify.lan.ddnsgeek.com"
-GOTIFY_TOKEN="ADuOnDBG7C27hcf"
+GOTIFY_URL="${GOTIFY_URL}"
+GOTIFY_TOKEN="${GOTIFY_TOKEN}"
 
 STATE_DIR="./docker-health-alert"
 STATE_FILE="${STATE_DIR}/last_unhealthy.txt"
diff --git a/monitoring/grafana/docker-compose.yml b/monitoring/grafana/docker-compose.yml
index 1806f02..227b770 100644
--- a/monitoring/grafana/docker-compose.yml
+++ b/monitoring/grafana/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: grafana
     restart: unless-stopped
     environment:
-      - GF_SERVER_ROOT_URL=https://grafana.lan.ddnsgeek.com/
+      - GF_SERVER_ROOT_URL=${GRAFANA_ROOT_URL}
     volumes:
       - ${PROJECT_ROOT}/monitoring/grafana/data:/var/lib/grafana
     networks:
diff --git a/monitoring/portainer/docker-compose.yml b/monitoring/portainer/docker-compose.yml
index 57badde..6402119 100644
--- a/monitoring/portainer/docker-compose.yml
+++ b/monitoring/portainer/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - traefik.http.services.portainer.loadbalancer.server.port=9000
 
     environment:
-      - GODEBUG=netdns=cgo
+      - GODEBUG=${PORTAINER_GODEBUG}
 #    healthcheck:
 #      test: ["CMD", "wget", "--spider", "-q", "https://portainer.lan.ddnsgeek.com/api/status"]
 #      interval: 30s