diff --git a/zabbix/docker-compose.yml b/zabbix/docker-compose.yml
index a8c2f0c..bc71882 100644
--- a/zabbix/docker-compose.yml
+++ b/zabbix/docker-compose.yml
@@ -2,8 +2,6 @@ version: '3.3'
 #secrets:
 #   psql_password:
 #     file: ./psql_password
-env_file:
-    - psql.env
 
 services:
   zabbix-web:
@@ -21,6 +19,8 @@ services:
     volumes:
        - ./zabbix/zabbix-web/ssl:/etc/ssl/nginx:ro
        - ./zabbix/zabbix-web/leverify:/leverify
+    env_file:
+        - ./psql.env
     environment:
       ZBX_SERVER_NAME: Skyfall Zabbix
       ZBX_SERVER_HOST: zabbix-server
@@ -49,6 +49,8 @@ services:
        - ./zabbix/zabbix-server/data/ssl-ca:/var/lib/zabbix/ssl/ssl_ca
        - ./zabbix/zabbix-server/data/snmptraps:/var/lib/zabbix/snmptraps
        - ./zabbix/zabbix-server/data/mibs:/var/lib/zabbix/mibs
+    env_file:
+        - ./psql.env
     environment:
       DB_SERVER_HOST: zabbix-database
       TZ: America/Chicago
@@ -62,6 +64,8 @@ services:
     networks:
       zabbix_network:
         ipv4_address: 192.168.176.2
+    env_file:
+        - ./psql.env
     environment:
       #POSTGRES_DB: zabbix
       #POSTGRES_USER: zabbix