diff --git a/Postgres/.env b/Postgres/.env
new file mode 100644
index 0000000000..b0f3e3d126
--- /dev/null
+++ b/Postgres/.env
@@ -0,0 +1,2 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
\ No newline at end of file
diff --git a/Samla/.env b/Samla/.env
new file mode 100644
index 0000000000..6bcdf92b00
--- /dev/null
+++ b/Samla/.env
@@ -0,0 +1,3 @@
+SIMPLESAMLPHP_SP_ENTITY_ID=oneuptime.com
+SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost:3002/api/user/sso/callback
+SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-logout.php/test-sp
\ No newline at end of file
diff --git a/Saml/run-server.sh b/Samla/run-server.sh
similarity index 100%
rename from Saml/run-server.sh
rename to Samla/run-server.sh
diff --git a/Saml/users.php b/Samla/users.php
similarity index 100%
rename from Saml/users.php
rename to Samla/users.php
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 7a7c322656..00433585f6 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -7,9 +7,8 @@ services:
     postgres:
         image: postgres:latest
         restart: always
-        environment:
-            - POSTGRES_USER=postgres
-            - POSTGRES_PASSWORD=postgres
+        env_file:
+            - ./Postgres/.env
         ports:
             - '5400:5432'
         volumes:
@@ -115,7 +114,7 @@ services:
         environment:
             - IS_SAAS_SERVICE=${IS_SAAS_SERVICE}
         depends_on:
-            - dashboard-api
+            - identity
     dashboard:
         ports:
             - '3000:3000'
@@ -293,13 +292,8 @@ services:
             context: ./Haraka
             args:
                 PORT: '2525'
-        environment:
-            - SMTP_USER=user@oneuptime.com
-            - SMTP_PASSWORD=oneuptime
-            - DOMAIN="${DOMAIN}"
-            - DKIM_PRIVATE_KEY="${DKIM_PRIVATE_KEY}"
-            - TLS_CERT="${TLS_CERT}"
-            - TLS_KEY="${TLS_KEY}"
+        env_file:
+            - ./Haraka/.env
     script-runner:
         ports:
             - '3009:3009'
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b7577d6ba8..e136194659 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -14,20 +14,14 @@ services:
             context: ./Haraka
             args:
                 PORT: '2525'
-        environment:
-            - SMTP_USER=user@oneuptime.com
-            - SMTP_PASSWORD=oneuptime
-            - DOMAIN="${DOMAIN}"
-            - DKIM_PRIVATE_KEY="${DKIM_PRIVATE_KEY}"
-            - TLS_CERT="${TLS_CERT}"
-            - TLS_KEY="${TLS_KEY}"
+        env_file:
+            - ./Haraka/.env
 
     postgres:
         image: postgres:latest
         restart: always
-        environment:
-            - POSTGRES_USER=postgres
-            - POSTGRES_PASSWORD=postgres
+        env_file:
+            - ./Postgres/.env
         ports:
             - '5400:5432'
         volumes: 
@@ -77,9 +71,13 @@ services:
             context: .
             dockerfile: ./Accounts/Dockerfile.dev
         env_file:
+            - ./Common/.env
+            - ./CommonUI/.env
             - ./Accounts/.env
         environment:
             - IS_SAAS_SERVICE=${IS_SAAS_SERVICE}
+        depends_on:
+            - identity
         volumes:
             - ./accounts:/usr/src/app
             # Use node modules of the container and not host system.
@@ -266,6 +264,7 @@ services:
             context: .
             dockerfile: ./Identity/Dockerfile.dev
         env_file:
+            - ./CommonServer/.env
             - ./Identity/.env
         environment:
             - REDIS_HOST=redis
diff --git a/docker-compose.yml b/docker-compose.yml
index 00310c3f79..d1cb6d7a2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,9 +4,8 @@ services:
     postgres:
         image: postgres:latest
         restart: always
-        environment:
-            - POSTGRES_USER=postgres
-            - POSTGRES_PASSWORD=postgres
+        env_file:
+            - ./Postgres/.env
         ports:
             - '5400:5432'
         volumes: 
@@ -101,7 +100,8 @@ services:
         environment:
             - IS_SAAS_SERVICE=${IS_SAAS_SERVICE}
         depends_on:
-            - dashboard-api
+            - identity
+        
     dashboard:
         ports:
             - '3000:3000'
@@ -247,13 +247,9 @@ services:
         ports:
             - '2525:2525'
         image: oneuptime/haraka:latest
-        environment:
-            - SMTP_USER=user@oneuptime.com
-            - SMTP_PASSWORD=oneuptime
-            - DOMAIN="${DOMAIN}"
-            - DKIM_PRIVATE_KEY="${DKIM_PRIVATE_KEY}"
-            - TLS_CERT="${TLS_CERT}"
-            - TLS_KEY="${TLS_KEY}"
+        env_file:
+            - ./Haraka/.env
+        
     script-runner:
         ports:
             - '3009:3009'