diff --git a/.gitignore b/.gitignore
index cba61b605a..703da139e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,9 +62,9 @@ GoSDK/tester/
 
 secret.env
 
-/.env
+*/.env
 
 config.env
 
 # This file is autofenerated from the template
-docker-compose.yml
\ No newline at end of file
+docker-compose.yml
diff --git a/Postgres/.env.tpl b/Postgres/.env.tpl
index 62caf15ea6..9d2da19db4 100644
--- a/Postgres/.env.tpl
+++ b/Postgres/.env.tpl
@@ -1,2 +1,2 @@
-POSTGRES_USER={{ .Env.DATABASE_USER }}
+POSTGRES_USER={{ .Env.DATABASE_USERNAME }}
 POSTGRES_PASSWORD={{ .Env.DATABASE_PASSWORD }}
\ No newline at end of file
diff --git a/config.tpl.env b/config.tpl.env
index 736ad29106..a071b6cd1a 100644
--- a/config.tpl.env
+++ b/config.tpl.env
@@ -71,5 +71,4 @@ INTERNAL_SMTP_PASSWORD=oneuptime
 # Licensing Database 
 AIRTABLE_API_KEY=
 AIRTABLE_BASE_ID=
-TOKEN_SECRET={{ .Env.ENCRYPTION_SECRET }}
-
+TOKEN_SECRET={{ .Env.ENCRYPTION_SECRET }}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 3d1926eb48..0000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-version: '3.7'
-
-services:
-    ##IMPORTANT:
-    ## This container is an SMTP server used to send emails.
-    ## Setup private, tls_cert and tls_key keys before running this part
-    haraka:
-        ports:
-            - '2525:2525'
-        build:
-            network: host
-            context: ./Haraka
-        env_file:
-            - ./Haraka/.env
-    
-    redis:
-        image: redis:7.0.3
-        ports:
-            - '6379:6379'
-        command: redis-server /usr/local/etc/redis/redis.conf
-        env_file:
-            - ./Redis/.env
-        volumes:
-            - ./Redis/redis.conf:/usr/local/etc/redis/redis.conf
-
-    postgres:
-        image: postgres:latest
-        restart: always
-        env_file:
-            - ./Postgres/.env
-        ports:
-            - '5400:5432'
-        volumes: 
-            - postgres:/var/lib/postgresql/data
-    
-    mail:
-        ports:
-            
-            - 3190:3190
-        
-        image:  oneuptime/mail:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonServer/.env
-            - ./CommonServer/secret.env
-            - ./Mail/.env
-        depends_on:
-            - haraka
-            - postgres
-        
-
-    
-
-    accounts:
-        ports:
-            - '3003:3003'
-        
-        image:  oneuptime/accounts:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonUI/.env
-            - ./Accounts/.env
-
-        depends_on:
-            - identity
-        
-
-    dashboard:
-        ports:
-            - '3009:3009'
-        
-        image:  oneuptime/dashboard:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonUI/.env
-            - ./Accounts/.env
-
-        depends_on:
-            - identity
-            - accounts
-        
-    
-
-    status-page:
-        ports:
-            - '3105:3105'
-        
-        image:  oneuptime/status-page:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonUI/.env
-            - ./StatusPage/.env
-
-        depends_on:
-            - accounts
-            - dashboard-api
-        
-
-    dashboard-api:
-        ports:
-            - '3002:3002'
-            
-        
-        image:  oneuptime/dashboard-api:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonServer/.env
-            - ./CommonServer/secret.env
-            - ./DashboardAPI/.env
-
-        depends_on:
-            - redis
-            - postgres
-            - mail
-        links:
-            - redis
-            - postgres
-            - mail
-        
-    
-
-
-    workers:
-        ports:
-            - '3452:3452'
-            
-        
-        image:  oneuptime/workers:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonServer/.env
-            - ./CommonServer/secret.env
-            - ./Workers/.env
-
-        depends_on:
-            - postgres
-            - mail
-        links:
-            - postgres
-            - mail
-        
-    
-
-
-
-    identity:
-        ports:
-            - '3087:3087'
-            
-        
-        image:  oneuptime/identity:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonServer/.env
-            - ./CommonServer/secret.env
-            - ./Identity/.env
-
-        depends_on:
-            - redis
-            - postgres
-            - mail
-        links:
-            - redis
-            - postgres
-            - mail
-        
-    
-
-    file:
-        ports:
-            - '3125:3125'
-            
-        
-        image:  oneuptime/file:latest
-        
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonServer/.env
-            - ./CommonServer/secret.env
-            - ./File/.env
-
-        depends_on:
-            - postgres
-        links:
-            - postgres
-        
-
-  
-    home:
-        ports:
-            - '1444:1444'
-            
-        env_file:
-            - ./Common/.env
-            - ./Common/secret.env
-            - ./CommonServer/.env
-            - ./CommonServer/secret.env
-            - ./Home/.env
-        
-        image:  oneuptime/home:latest
-        
-        
-    
-
-    nginx:
-        depends_on:
-            - identity
-            - accounts
-            - dashboard-api
-            - dashboard
-            - home
-        restart: always
-        build:
-            dockerfile: Dockerfile
-            network: host
-            context: ./Nginx
-        ports:
-            - '80:80'
-            - '443:443'
-volumes:
-    postgres:
diff --git a/preinstall.sh b/preinstall.sh
index deeecd86c7..5c8f3417d2 100644
--- a/preinstall.sh
+++ b/preinstall.sh
@@ -111,11 +111,6 @@ cat config.env.temp | gomplate > config.env
 
 rm config.env.temp
 
-echo "Config file has been generated at config.env. Please look at the config, make changes and when you're done - hit enter to continue with the setup."
-read -r ENTER
-
-
-
 # Load env values from config.env
 export $(grep -v '^#' config.env | xargs)