diff --git a/gitea/.env b/gitea/.env
new file mode 100644
index 0000000..ffb79b6
--- /dev/null
+++ b/gitea/.env
@@ -0,0 +1,11 @@
+# Environment variables for Gitea
+
+USER_UID=1000
+USER_GID=1000
+GITEA__database__DB_TYPE=mysql
+GITEA__database__HOST=database:3306
+GITEA__database__NAME=gitea
+GITEA__database__USER=gitea
+GITEA__database__PASSWD=giteapass123
+PORT_1="3000"    # "3000:3000"
+PORT_2="2222" # "2222:22"
diff --git a/gitea/compose.yml b/gitea/compose.yml
index dc6426f..0f6b858 100644
--- a/gitea/compose.yml
+++ b/gitea/compose.yml
@@ -1,46 +1,23 @@
 version: "3"
 
-#networks:
-#  gitea:
-#    external: false
-
 services:
   server:
     image: gitea/gitea:latest
     container_name: gitea
     environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - GITEA__database__DB_TYPE=mysql
-      - GITEA__database__HOST=database: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
-#    networks:
-#      - gitea
     volumes:
-      # /home/rcadmin/docker/gitea/
       - /home/rcadmin/docker/gitea/data:/data
       - /home/rcadmin/docker/gitea/.ssh:/data/git/.ssh
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "3000:3000"
-      - "2222:22"
-
-#    depends_on:
-#      - db
-
-#  db:
-#    image: mariadb:latest
-#    restart: unless-stopped
-#    environment:
-#      - MYSQL_ROOT_PASSWORD=strongpassword
-#      - MYSQL_USER=gitea
-#      - MYSQL_PASSWORD=strongpassword
-#      - MYSQL_DATABASE=gitea
-#    networks:
-#      - gitea
-#    volumes:
-#      - ./mariadb:/var/lib/mysql1~version: "3"
+      - "${PORT_1}:3000"
+      - "${PORT_2}:22"
diff --git a/homebox/compose.yml b/homebox/compose.yml
new file mode 100644
index 0000000..aff70a1
--- /dev/null
+++ b/homebox/compose.yml
@@ -0,0 +1,21 @@
+# Service Name: Homebox
+# Description : 
+# Homepage    : 
+
+services:
+  homebox:
+    image: ghcr.io/sysadminsmedia/homebox:latest
+#   image: ghcr.io/sysadminsmedia/homebox:latest-rootless
+    container_name: homebox
+    restart: unless-stopped
+    environment:
+    - 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
+    volumes:
+#      - homebox-data:/data/
+      - /home/rcadmin/docker/homebox/data:/data/
+    ports:
+      - 3100:7745
diff --git a/shepherd/.env b/shepherd/.env
index a2b3659..279f6c0 100644
--- a/shepherd/.env
+++ b/shepherd/.env
@@ -1,3 +1,4 @@
-# Shepherd variables
+# Environment variables for Shepherd
 
 TZ=Europe/Oslo
+SLEEP_TIME='180m'
diff --git a/shepherd/compose.yml b/shepherd/compose.yml
index 6c508cd..f7df6e9 100644
--- a/shepherd/compose.yml
+++ b/shepherd/compose.yml
@@ -4,6 +4,8 @@ services:
   shepherd:
     #build: .
     image: containrrr/shepherd
+    restart: unless-stopped
+
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     deploy:
@@ -12,4 +14,4 @@ services:
           - node.role == manager
     environment:
       TZ: ${TZ}
-      SLEEP_TIME: '180m'
+      SLEEP_TIME: ${SLEEP_TIME}
diff --git a/watchtower/.env b/watchtower/.env
new file mode 100644
index 0000000..0f10a74
--- /dev/null
+++ b/watchtower/.env
@@ -0,0 +1,5 @@
+# Environment variables for Watchtower
+
+TZ=Europe/Oslo
+WATCHTOWER_SCHEDULE="0 0 1 * * *"
+WATCHTOWER_CLEANUP="true"
\ No newline at end of file
diff --git a/watchtower/compose.yml b/watchtower/compose.yml
index 78418a6..f0aaa2f 100644
--- a/watchtower/compose.yml
+++ b/watchtower/compose.yml
@@ -4,9 +4,9 @@ services:
     container_name: watchtower
     restart: always
     environment: 
-      WATCHTOWER_SCHEDULE: "0 0 1 * * *" 
-      TZ: Europe/Oslo 
-      WATCHTOWER_CLEANUP: "true" 
+      WATCHTOWER_SCHEDULE: ${WATCHTOWER_SCHEDULE}
+      TZ: ${TZ}
+      WATCHTOWER_CLEANUP: ${WATCHTOWER_CLEANUP}
 #      WATCHTOWER_DEBUG: "true"      
 #      WATCHTOWER_NOTIFICATIONS: "email" 
 #      WATCHTOWER_NOTIFICATION_EMAIL_FROM: "cldocker01@cloud.local"