diff --git a/.env b/.env
index b1b0e52..20b5068 100644
--- a/.env
+++ b/.env
@@ -16,13 +16,3 @@ ADMIN_PASSWORD=8ung1e1!
 BACKUP_DIR=/mnt/truenas-backups
 MEDIA_DIR=/mnt/truenas-media
 STORAGE_DIR=/mnt/truenas-storage
-
-#WATCHTOWER
-WATCHTOWER_NOTIFICATIONS=email
-WATCHTOWER_NOTIFICATION_EMAIL_FROM=notify.akanealw@gmail.com
-WATCHTOWER_NOTIFICATION_EMAIL_TO=akanealw@gmail.com
-WATCHTOWER_NOTIFICATION_EMAIL_SERVER=smtp.gmail.com
-WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=587
-WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=notify.akanealw@gmail.com
-WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=leawkqqpthbwacrf
-WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2
diff --git a/admin/.env b/admin/.env
index 20b5068..b1b0e52 100644
--- a/admin/.env
+++ b/admin/.env
@@ -16,3 +16,13 @@ ADMIN_PASSWORD=8ung1e1!
 BACKUP_DIR=/mnt/truenas-backups
 MEDIA_DIR=/mnt/truenas-media
 STORAGE_DIR=/mnt/truenas-storage
+
+#WATCHTOWER
+WATCHTOWER_NOTIFICATIONS=email
+WATCHTOWER_NOTIFICATION_EMAIL_FROM=notify.akanealw@gmail.com
+WATCHTOWER_NOTIFICATION_EMAIL_TO=akanealw@gmail.com
+WATCHTOWER_NOTIFICATION_EMAIL_SERVER=smtp.gmail.com
+WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=587
+WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=notify.akanealw@gmail.com
+WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=leawkqqpthbwacrf
+WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2
diff --git a/admin/docker-compose.yml b/admin/docker-compose.yml
index 42cd61d..2a3982e 100644
--- a/admin/docker-compose.yml
+++ b/admin/docker-compose.yml
@@ -27,5 +27,22 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /etc/localtime:/etc/localtime:ro
 
+  watchtower:
+    container_name: watchtower
+    image: containrrr/watchtower
+    environment:
+      - WATCHTOWER_NOTIFICATIONS=${WATCHTOWER_NOTIFICATIONS}
+      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=${WATCHTOWER_NOTIFICATION_EMAIL_FROM}
+      - WATCHTOWER_NOTIFICATION_EMAIL_TO=${WATCHTOWER_NOTIFICATION_EMAIL_TO}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}
+      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}
+      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=${WATCHTOWER_NOTIFICATION_EMAIL_DELAY}
+    command: --interval 600
+    restart: always
+    volume:
+      - /var/run/docker.sock:/var/run/docker.sock
+
 networks:
     admin:
diff --git a/docker-compose.yml b/docker-compose.yml
index dd441cb..09a92dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,4 @@
 version: '3'
 
 services:
-  watchtower:
-    container_name: watchtower
-    image: containrrr/watchtower
-    environment:
-      - WATCHTOWER_NOTIFICATIONS=${WATCHTOWER_NOTIFICATIONS}
-      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=${WATCHTOWER_NOTIFICATION_EMAIL_FROM}
-      - WATCHTOWER_NOTIFICATION_EMAIL_TO=${WATCHTOWER_NOTIFICATION_EMAIL_TO}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}
-      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=${WATCHTOWER_NOTIFICATION_EMAIL_DELAY}
-    command: --interval 600
-    restart: always
-    volume:
-      - /var/run/docker.sock:/var/run/docker.sock
+