diff --git a/dockhand/.env b/dockhand/.env
new file mode 100644
index 0000000..93744eb
--- /dev/null
+++ b/dockhand/.env
@@ -0,0 +1,3 @@
+PUID=1000
+PGID=1000
+PORT=3002
diff --git a/dockhand/compose.yml b/dockhand/compose.yml
index 4c1d1b5..f8bb660 100644
--- a/dockhand/compose.yml
+++ b/dockhand/compose.yml
@@ -9,10 +9,10 @@ services:
     #container_name: dockhand
     #restart: unless-stopped
     environment:
-      - PUID=1000
-      - PGID=1000
+      - PUID=${PUID}
+      - PGID=${PGID}
     ports:
-      - 3002:3000
+      - ${PORT}:3000
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /home/rcadmin/docker/dockhand/data:/app/data
diff --git a/dozzle/.env b/dozzle/.env
new file mode 100644
index 0000000..9f65a1b
--- /dev/null
+++ b/dozzle/.env
@@ -0,0 +1,2 @@
+DOZZLE_MODE=swarm
+PORT=8280
diff --git a/dozzle/compose.yml b/dozzle/compose.yml
index 1373015..f59b2ac 100644
--- a/dozzle/compose.yml
+++ b/dozzle/compose.yml
@@ -10,14 +10,11 @@ services:
   dozzle:
     image: amir20/dozzle:latest
     environment:
-      - DOZZLE_MODE=swarm
-#      - DOZZLE_HOSTNAME=dozzle.home.ramberg.net
-#      - DOZZLE_REMOTE_AGENT=agent:7007
+      - DOZZLE_MODE=${DOZZLE_MODE:-swarm}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     ports:
-      - 8280:8080
-#    network_mode: "host"
+      - ${PORT}:8080
     networks:
       - dozzle
     deploy:
diff --git a/freshrss/.env b/freshrss/.env
new file mode 100644
index 0000000..48a4fd6
--- /dev/null
+++ b/freshrss/.env
@@ -0,0 +1,4 @@
+PUID=1000
+PGID=1000
+TZ=Europe/Oslo
+PORT=8083
diff --git a/freshrss/compose.yml b/freshrss/compose.yml
index 0ba6daf..c8b4ec7 100644
--- a/freshrss/compose.yml
+++ b/freshrss/compose.yml
@@ -8,13 +8,13 @@ services:
     image: lscr.io/linuxserver/freshrss:latest
     #container_name: freshrss
     environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Oslo
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
     volumes:
       - /home/rcadmin/docker/freshrss:/config
     ports:
-      - 8083:80
+      - ${PORT}:80
     #restart: unless-stopped
     networks:
       - freshrss
diff --git a/freshrss/log/logrotate.status b/freshrss/log/logrotate.status
index 776a9d3..262f7c4 100644
--- a/freshrss/log/logrotate.status
+++ b/freshrss/log/logrotate.status
@@ -1,6 +1,6 @@
 logrotate state -- version 2
 "/var/log/acpid.log" 2026-1-19-2:0:0
-"/config/log/nginx/access.log" 2026-2-8-2:0:0
+"/config/log/nginx/access.log" 2026-2-15-2:0:0
 "/var/log/php84/*.log" 2026-1-19-2:0:0
 "/config/log/nginx/error.log" 2026-1-19-2:0:0
-"/config/log/php/error.log" 2026-2-8-2:0:0
+"/config/log/php/error.log" 2026-2-15-2:0:0
diff --git a/gitea/compose.yml b/gitea/compose.yml
index ed0763a..aa50331 100644
--- a/gitea/compose.yml
+++ b/gitea/compose.yml
@@ -5,13 +5,13 @@ services:
     image: gitea/gitea:latest
     #container_name: gitea
     environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - GITEA__database__DB_TYPE=mysql
-      - GITEA__database__HOST=database.home.ramberg.net:3306
-      - GITEA__database__NAME=gitea
-      - GITEA__database__USER=gitea
-      - GITEA__database__PASSWD=giteapass123
+      - USER_UID=${USER_UID}
+      - USER_GID=${USER_GID}
+      - GITEA__database__DB_TYPE=${GITEA__database__DB_TYPE}
+      - GITEA__database__HOST=${GITEA__database__HOST}
+      - GITEA__database__NAME=${GITEA__database__NAME}
+      - GITEA__database__USER=${GITEA__database__USER}
+      - GITEA__database__PASSWD=${GITEA__database__PASSWD}
     #restart: unless-stopped
     volumes:
       - /home/rcadmin/docker/gitea/data:/data
@@ -19,8 +19,8 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - 3000:3000
-      - 2222:22
+      - ${PORT_1}:3000
+      - ${PORT_2}:22
     networks:
       - gitea
 
diff --git a/homebox/.env b/homebox/.env
new file mode 100644
index 0000000..399bf09
--- /dev/null
+++ b/homebox/.env
@@ -0,0 +1,10 @@
+# Homebox environment variables
+
+HBOX_LOG_LEVEL=info
+HBOX_LOG_FORMAT=text
+HBOX_WEB_MAX_FILE_UPLOAD=10
+
+# Please consider allowing analytics to help us improve Homebox (basic computer information, no personal data)
+HBOX_OPTIONS_ALLOW_ANALYTICS=false
+
+PORT=3100
diff --git a/homebox/compose.yml b/homebox/compose.yml
index fdf2322..b5e6f36 100644
--- a/homebox/compose.yml
+++ b/homebox/compose.yml
@@ -9,15 +9,15 @@ services:
     #container_name: homebox
     #restart: unless-stopped
     environment:
-    - HBOX_LOG_LEVEL=info
-    - HBOX_LOG_FORMAT=text
-    - HBOX_WEB_MAX_FILE_UPLOAD=10
+    - HBOX_LOG_LEVEL=${HBOX_LOG_LEVEL:-info}
+    - HBOX_LOG_FORMAT=${HBOX_LOG_FORMAT:-text}
+    - HBOX_WEB_MAX_FILE_UPLOAD=${HBOX_WEB_MAX_FILE_UPLOAD:-10}
     # Please consider allowing analytics to help us improve Homebox (basic computer information, no personal data)
-    - HBOX_OPTIONS_ALLOW_ANALYTICS=false
+    - HBOX_OPTIONS_ALLOW_ANALYTICS=${HBOX_OPTIONS_ALLOW_ANALYTICS:-false}
     volumes:
       - /home/rcadmin/docker/homebox/data:/data/
     ports:
-      - 3100:7745
+      - ${PORT}:7745
 
     deploy:
       labels:
diff --git a/homepage/.env b/homepage/.env
new file mode 100644
index 0000000..863e437
--- /dev/null
+++ b/homepage/.env
@@ -0,0 +1,5 @@
+# Homepage .env file
+
+PORT=3010
+
+HOMEPAGE_ALLOWED_HOSTS=www.home.ramberg.net,homepage.home.ramberg.net,docker-01.home.ramberg.net:3010,192.168.50.201:3010 # required, may need port. See gethomepage.dev/installation/#homepage_allowed_hosts
diff --git a/homepage/compose.yml b/homepage/compose.yml
index 1af3a22..39028be 100644
--- a/homepage/compose.yml
+++ b/homepage/compose.yml
@@ -7,13 +7,13 @@ services:
   homepage:
     image: ghcr.io/gethomepage/homepage:latest
     ports:
-      - 3010:3000
+      - ${PORT}:3000
     restart: unless-stopped
     volumes:
       - /home/rcadmin/docker/homepage/config:/app/config # Make sure your local config directory exists
       - /var/run/docker.sock:/var/run/docker.sock:ro # (optional) For docker integrations
     environment:
-      HOMEPAGE_ALLOWED_HOSTS: www.home.ramberg.net,homepage.home.ramberg.net,docker-01.home.ramberg.net:3010,192.168.50.201:3010 # required, may need port. See gethomepage.dev/installation/#homepage_allowed_hosts
+      HOMEPAGE_ALLOWED_HOSTS: ${HOMEPAGE_ALLOWED_HOSTS}
     deploy:
       placement:
         constraints:
diff --git a/iperf3/.env b/iperf3/.env
new file mode 100644
index 0000000..1f3248b
--- /dev/null
+++ b/iperf3/.env
@@ -0,0 +1,3 @@
+# iperf3 .env file
+
+PORT=5201
diff --git a/iperf3/compose.yml b/iperf3/compose.yml
index df38f94..fe3e13f 100644
--- a/iperf3/compose.yml
+++ b/iperf3/compose.yml
@@ -8,7 +8,7 @@ services:
         command: '-s'
         image: networkstatic/iperf3
         ports:
-            - '5201:5201'
+            - '${PORT}:5201'
         #container_name: iperf3-server
         tty: true
         stdin_open: true
diff --git a/it-tools/.env b/it-tools/.env
new file mode 100644
index 0000000..0fe5e5d
--- /dev/null
+++ b/it-tools/.env
@@ -0,0 +1,3 @@
+# Environment variables for the IT Tools application
+
+PORT=9080
diff --git a/it-tools/compose.yml b/it-tools/compose.yml
index 71eacd6..1a85ad9 100644
--- a/it-tools/compose.yml
+++ b/it-tools/compose.yml
@@ -5,7 +5,7 @@ services:
         #container_name: it-tools
         #restart: unless-stopped
         ports:
-            - 9080:80
+            - ${PORT}:80
 
         deploy:
             labels:
diff --git a/mealie/.env b/mealie/.env
new file mode 100644
index 0000000..18a7dd2
--- /dev/null
+++ b/mealie/.env
@@ -0,0 +1,6 @@
+# This file is used to set environment variables for the Mealie application.
+
+PORT=9091
+
+ALLOW_SIGNUP=false
+LOG_LEVEL=DEBUG
diff --git a/mealie/compose.yml b/mealie/compose.yml
index 0f20fe9..5efef95 100644
--- a/mealie/compose.yml
+++ b/mealie/compose.yml
@@ -16,10 +16,10 @@ services:
     volumes:
       - /home/rcadmin/docker/mealie/data:/app/data/
     ports:
-      - 9091:9000
+      - ${PORT}:9000
     environment:
-      ALLOW_SIGNUP: "false"
-      LOG_LEVEL: "DEBUG"
+      ALLOW_SIGNUP: ${ALLOW_SIGNUP:-false}
+      LOG_LEVEL: ${LOG_LEVEL:-INFO}
 
       DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
       # =====================================
diff --git a/n8n/.env b/n8n/.env
index 1b06c14..05131ac 100644
--- a/n8n/.env
+++ b/n8n/.env
@@ -1,6 +1,7 @@
 # Admin: kim@ramberg.net
 # Pass : Homekbr1998!
 
+PORT=5678
 
 N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
 N8N_SUBDOMAIN='n8n'
diff --git a/n8n/compose.yml b/n8n/compose.yml
index 0520006..5a8c2ba 100644
--- a/n8n/compose.yml
+++ b/n8n/compose.yml
@@ -7,19 +7,18 @@ services:
     image: docker.n8n.io/n8nio/n8n
     restart: always
     ports:
-      - "5678:5678"
-#      - "127.0.0.1:5678:5678"
+      - "${PORT}:5678"
     environment:
-      - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
-      - N8N_HOST=n8n.home.ramberg.net
-      - N8N_PORT=5678
-      - N8N_PROTOCOL=https
-      - N8N_RUNNERS_ENABLED=true
-      - NODE_ENV=production
-      - WEBHOOK_URL=https://n8n.home.ramberg.net/
-      - GENERIC_TIMEZONE=Europe/Oslo
-      - TZ=Europe/Oslo
-      - DB_SQLITE_POOL_SIZE=0
+      - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS}
+      - N8N_HOST=${N8N_SUBDOMAIN}.${N8N_DOMAIN_NAME}
+      - N8N_PORT=${N8N_PORT}
+      - N8N_PROTOCOL=${N8N_PROTOCOL}
+      - N8N_RUNNERS_ENABLED=${N8N_RUNNERS_ENABLED}
+      - NODE_ENV=${NODE_ENV}
+      - WEBHOOK_URL=${N8N_PROTOCOL}://${N8N_SUBDOMAIN}.${N8N_DOMAIN_NAME}/
+      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE}
+      - TZ=${GENERIC_TIMEZONE}
+      - DB_SQLITE_POOL_SIZE=${DB_SQLITE_POOL_SIZE}
     volumes:
       - /home/rcadmin/docker/n8n/data:/home/node/.n8n
       - /home/rcadmin/docker/n8n/files:/files
diff --git a/nginx-proxy-manager/.env b/nginx-proxy-manager/.env
new file mode 100644
index 0000000..9d26aa1
--- /dev/null
+++ b/nginx-proxy-manager/.env
@@ -0,0 +1,5 @@
+# 
+
+PORT_1=80
+PORT_2=81
+PORT_3=443
diff --git a/nginx-proxy-manager/compose.yml b/nginx-proxy-manager/compose.yml
index 2e14d63..ee2d4d8 100644
--- a/nginx-proxy-manager/compose.yml
+++ b/nginx-proxy-manager/compose.yml
@@ -4,9 +4,9 @@ services:
     image: 'docker.io/jc21/nginx-proxy-manager:latest'
     restart: unless-stopped
     ports:
-      - '80:80'
-      - '81:81'
-      - '443:443'
+      - '${PORT_1}:80'
+      - '${PORT_2}:81'
+      - '${PORT_3}:443'
     volumes:
       - ./data:/data
       - ./letsencrypt:/etc/letsencrypt
diff --git a/notes.md b/notes.md
index bf38542..582d095 100644
--- a/notes.md
+++ b/notes.md
@@ -58,3 +58,13 @@ volumes:
       device: /data/db_data
       o: bind
 ```
+
+
+```
+env $(grep -v '^#' .env | xargs) docker stack deploy -c docker-compose.yml stack-name-here
+
+
+env $(grep -v '^#' ${PWD}/.env | xargs) docker stack deploy -c docker-compose.yml stack-name-here
+
+```
+
diff --git a/ntfy/.env b/ntfy/.env
new file mode 100644
index 0000000..ca907a6
--- /dev/null
+++ b/ntfy/.env
@@ -0,0 +1,5 @@
+# ntfy - a simple HTTP-based pub-sub notification service
+# Environment variables for ntfy
+
+TZ=Europe/Oslo
+PORT=9010
diff --git a/ntfy/compose.yml b/ntfy/compose.yml
index db6b450..32d343e 100644
--- a/ntfy/compose.yml
+++ b/ntfy/compose.yml
@@ -7,7 +7,7 @@ services:
     command:
       - serve
     environment:
-      - TZ=Europe/Oslo    # optional: set desired timezone
+      - TZ=${TZ}    # optional: set desired timezone
     #user: UID:GID # optional: replace with your own user/group or uid/gid
     volumes:
       - /home/rcadmin/docker/ntfy/data/cache_ntfy:/var/cache/ntfy
@@ -15,7 +15,7 @@ services:
     networks:
       - ntfy
     ports:
-      - 9010:80
+      - ${PORT}:80
     healthcheck: # optional: remember to adapt the host:port to your environment
         test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
         interval: 60s
diff --git a/openspeedtest/.env b/openspeedtest/.env
new file mode 100644
index 0000000..ebecce8
--- /dev/null
+++ b/openspeedtest/.env
@@ -0,0 +1,4 @@
+# This file is used to set environment variables for the OpenSpeedTest application.
+
+PORT_1=3004
+PORT_2=3005
diff --git a/openspeedtest/compose.yml b/openspeedtest/compose.yml
index 06c383f..9cd6e2f 100644
--- a/openspeedtest/compose.yml
+++ b/openspeedtest/compose.yml
@@ -11,8 +11,8 @@ services:
       networks:
         - openspeedtest
       ports:
-        - '3004:3000'
-        - '3005:3001'
+        - '${PORT_1}:3000'
+        - '${PORT_2}:3001'
       image: openspeedtest/latest
       deploy:
         labels:
diff --git a/pihole/.env b/pihole/.env
new file mode 100644
index 0000000..9dfd6bd
--- /dev/null
+++ b/pihole/.env
@@ -0,0 +1,18 @@
+# Pi-hole Docker Environment Variables
+
+# Ports
+# DNS Ports
+PORT_DNS_TCP=53
+PORT_DNS_UDP=53
+# Default HTTP Port
+PORT_HTTP=8080
+# Default HTTPs Port. FTL will generate a self-signed certificate
+PORT_HTTPS=8443
+# Uncomment the below if using Pi-hole as your DHCP Server
+#PORT_DHCP_SERVER=67
+
+# Environment variables
+TZ=Europe/Oslo'
+
+# Set a password to access the web interface. Not setting one will result in a random password being assigned
+FTLCONF_webserver_api_password='homekbr1998'
diff --git a/pihole/compose.yml b/pihole/compose.yml
index f629114..0a7dcae 100644
--- a/pihole/compose.yml
+++ b/pihole/compose.yml
@@ -8,19 +8,19 @@ services:
       - pihole
     ports:
       # DNS Ports
-      - "53:53/tcp"
-      - "53:53/udp"
+      - "${PORT_DNS_TCP}:53/tcp"
+      - "${PORT_DNS_UDP}:53/udp"
       # Default HTTP Port
-      - "8080:80/tcp"
+      - "${PORT_HTTP}:80/tcp"
       # Default HTTPs Port. FTL will generate a self-signed certificate
-      - "8443:443/tcp"
+      - "${PORT_HTTPS}:443/tcp"
       # Uncomment the below if using Pi-hole as your DHCP Server
-      #- "67:67/udp"
+      #- "${PORT_DHCP_SERVER}:67/udp"
     environment:
       # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
-      TZ: 'Europe/Oslo'
+      TZ: ${TZ}
       # Set a password to access the web interface. Not setting one will result in a random password being assigned
-      FTLCONF_webserver_api_password: 'homekbr1998'
+      ${FTLCONF_webserver_api_password}: 'homekbr1998'
     # Volumes store your data between container upgrades
     volumes:
       # For persisting Pi-hole's databases and common configuration file
diff --git a/portainer/.env b/portainer/.env
new file mode 100644
index 0000000..e3ac698
--- /dev/null
+++ b/portainer/.env
@@ -0,0 +1,9 @@
+# Environment variables for Portainer
+
+# Ports
+PORT_1=8000
+PORT_2=9443
+
+# Environment variables
+VIRTUAL_HOST=portainer.home.ramberg.net
+#VIRTUAL_PORT=9443
diff --git a/portainer/compose.yml b/portainer/compose.yml
index 13d174a..0337e6a 100644
--- a/portainer/compose.yml
+++ b/portainer/compose.yml
@@ -5,14 +5,14 @@ services:
         networks:
           - portainer
         ports:
-            - 8000:8000
-            - 9443:9443
+            - ${PORT_1}:8000
+            - ${PORT_2}:9443
         #container_name: portainer
         command: --no-analytics
         #restart: always
         environment:
-          - VIRTUAL_HOST=portainer.home.ramberg.net
-          #- VIRTUAL_PORT=9443
+          - VIRTUAL_HOST=${VIRTUAL_HOST}
+          #- VIRTUAL_PORT=${VIRTUAL_PORT}
         volumes:
           - /var/run/docker.sock:/var/run/docker.sock
           - /home/rcadmin/docker/portainer/data:/data
diff --git a/shepherd/compose.yml b/shepherd/compose.yml
index 0366a9c..b999142 100644
--- a/shepherd/compose.yml
+++ b/shepherd/compose.yml
@@ -17,9 +17,8 @@ services:
       homepage.name: Shepherd
       #homepage.href: https://portainer.home.ramberg.net/
     environment:
-      TZ: Europe/Oslo
-      SLEEP_TIME: 360m
-      WITH_REGISTRY_AUTH: 'true'
-      REGISTRY_USER: kbramberg
-      REGISTRY_PASSWORD: askjfhKJ34Bsdjrt4387
-
+      TZ: ${TZ}
+      SLEEP_TIME: ${SLEEP_TIME}
+      WITH_REGISTRY_AUTH: ${WITH_REGISTRY_AUTH}
+      REGISTRY_USER: ${REGISTRY_USER}
+      REGISTRY_PASSWORD: ${REGISTRY_PASSWORD}
diff --git a/start.sh b/start.sh
index 530c404..141d491 100755
--- a/start.sh
+++ b/start.sh
@@ -3,4 +3,6 @@
 # Copy this file to /usr/sbin/start to enable easy startup
 # cp start.sh /usr/sbin/start
 
-docker stack deploy -c compose.yml ${PWD##*/}
+#docker stack deploy -c compose.yml ${PWD##*/}
+
+env $(grep -v '^#' ${PWD}/.env | sed 's/#.*//' | xargs) docker stack deploy -c compose.yml ${PWD##*/}
diff --git a/stunnel/.env b/stunnel/.env
new file mode 100644
index 0000000..e69de29
diff --git a/tor-privoxy/.env b/tor-privoxy/.env
new file mode 100644
index 0000000..fc78729
--- /dev/null
+++ b/tor-privoxy/.env
@@ -0,0 +1,6 @@
+# Environment variables for Tor and Privoxy configuration
+
+# Ports
+PORT_TOR_PROXY=9050
+PORT_TOR_CONTROL=9051
+PORT_PRIVOXY=8118
diff --git a/tor-privoxy/compose.yml b/tor-privoxy/compose.yml
index ff7c56f..da17ce4 100644
--- a/tor-privoxy/compose.yml
+++ b/tor-privoxy/compose.yml
@@ -8,14 +8,14 @@ services:
     networks:
       - tor-privoxy
     ports:
-      - "9050:9050" # Tor proxy
-      - "9051:9051" # Tor control port
-      - "8118:8118" # Privoxy
+      - "${PORT_TOR_PROXY}:9050" # Tor proxy
+      - "${PORT_TOR_CONTROL}:9051" # Tor control port
+      - "${PORT_PRIVOXY}:8118" # Privoxy
     deploy:
       placement:
         constraints:
           - node.role == manager
-pihole      labels:
+      labels:
         - homepage.group=Services
         - homepage.name=Tor-Privoxy
         #- homepage.icon=portainer.png
diff --git a/uptime_kuma/compose.yml b/uptime_kuma/compose.yml
index 5c516a7..245064d 100644
--- a/uptime_kuma/compose.yml
+++ b/uptime_kuma/compose.yml
@@ -11,7 +11,6 @@ services:
     networks:
       - uptime-kuma
     ports:
-#            - '127.0.0.1:3001:3001'
       - '3001:3001'
     restart: always
     deploy:
diff --git a/vaultwarden/.env b/vaultwarden/.env
index 36f1859..3ebf1e2 100644
--- a/vaultwarden/.env
+++ b/vaultwarden/.env
@@ -1,10 +1,9 @@
 #General Settings
-ADMIN_TOKEN='HFoztERqAoXreBf7yM0NPbKhTguKoVDpKm4NIWVhiegIbuZKAzhr1ITTJdyCIFII' # randomly generated string of characters, for example running openssl rand -base64 48
-#//Refer https://github.com/dani-garcia/vaultwarden/wiki/Enabling-admin-page#secure-the-admin_token 
+# randomly generated string of characters, for example running openssl rand -base64 48
+ADMIN_TOKEN='HFoztERqAoXreBf7yM0NPbKhTguKoVDpKm4NIWVhiegIbuZKAzhr1ITTJdyCIFII' #//Refer https://github.com/dani-garcia/vaultwarden/wiki/Enabling-admin-page#secure-the-admin_token 
 
 WEBSOCKET_ENABLED=true
-SIGNUPS_ALLOWED=false ##change to false once create the admin account
-#DOMAIN=https://bitwarden.example.com #replace example.com with your domain
+SIGNUPS_ALLOWED=false #change to false once create the admin account
 DOMAIN='https://vaultwarden.ramberg.net' #replace example.com with your domain
 
 # SMTP server configuration
diff --git a/vaultwarden/compose copy 2.yml b/vaultwarden/compose copy 2.yml
new file mode 100644
index 0000000..18f34c3
--- /dev/null
+++ b/vaultwarden/compose copy 2.yml	
@@ -0,0 +1,36 @@
+# Service Name: VaultWarden
+# Description : Open source server for bitwarden clients
+# Homepage    : https://github.com/dani-garcia/vaultwarden
+
+services:
+  vaultwarden:
+    image: vaultwarden/server:latest
+#    container_name: vaultwarden
+#    restart: unless-stopped
+    environment:
+#      DOMAIN: "https://vaultwarden.ramberg.net"
+      - DOMAIN=https://vaultwarden.ramberg.net
+      - ADMIN_TOKEN=HFoztERqAoXreBf7yM0NPbKhTguKoVDpKm4NIWVhiegIbuZKAzhr1ITTJdyCIFII
+      - WEBSOCKET_ENABLED=true
+      - SIGNUPS_ALLOWED=false
+    volumes:
+      - /home/rcadmin/docker/vaultwarden/data/:/data/
+    ports:
+      - 8082:80
+    networks:
+      - vaultwarden
+
+    deploy:
+      labels:
+        - homepage.group=Services
+        - homepage.name=Vaultwarden
+        - homepage.icon=vaultwarden.png
+        - homepage.href=https://vaultwarden.ramberg.net/
+        #- homepage.instance.internal.href=http://emby.lan/
+        #- homepage.instance.public.href=https://emby.mydomain.com/
+        #- homepage.description=GIT server
+
+networks:
+  vaultwarden:
+    driver: overlay
+    attachable: true
diff --git a/vaultwarden/compose.yml b/vaultwarden/compose.yml
index 18f34c3..83261fb 100644
--- a/vaultwarden/compose.yml
+++ b/vaultwarden/compose.yml
@@ -5,14 +5,11 @@
 services:
   vaultwarden:
     image: vaultwarden/server:latest
-#    container_name: vaultwarden
-#    restart: unless-stopped
     environment:
-#      DOMAIN: "https://vaultwarden.ramberg.net"
-      - DOMAIN=https://vaultwarden.ramberg.net
-      - ADMIN_TOKEN=HFoztERqAoXreBf7yM0NPbKhTguKoVDpKm4NIWVhiegIbuZKAzhr1ITTJdyCIFII
-      - WEBSOCKET_ENABLED=true
-      - SIGNUPS_ALLOWED=false
+      - DOMAIN=${DOMAIN}
+      - ADMIN_TOKEN=${ADMIN_TOKEN}
+      - WEBSOCKET_ENABLED=${WEBSOCKET_ENABLED}
+      - SIGNUPS_ALLOWED=${SIGNUPS_ALLOWED}
     volumes:
       - /home/rcadmin/docker/vaultwarden/data/:/data/
     ports:
@@ -25,7 +22,7 @@ services:
         - homepage.group=Services
         - homepage.name=Vaultwarden
         - homepage.icon=vaultwarden.png
-        - homepage.href=https://vaultwarden.ramberg.net/
+        - homepage.href=${DOMAIN}
         #- homepage.instance.internal.href=http://emby.lan/
         #- homepage.instance.public.href=https://emby.mydomain.com/
         #- homepage.description=GIT server