diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index 498f37b84..28f8c47df 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -3,22 +3,25 @@ version: "3.8"
 services:
         web:
                 container_name: web
+                platform: linux/amd64
                 image: makeplane/plane-frontend:latest
                 restart: always
                 command: /usr/local/bin/start.sh web/server.js web
-                env_file:
-                        - ./web/.env
+                environment:
+                        - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
+                        - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces}
                 depends_on:
                         - api
                         - worker
 
         space:
                 container_name: space
+                platform: linux/amd64
                 image: makeplane/plane-space:latest
                 restart: always
                 command: /usr/local/bin/start.sh space/server.js space
-                env_file:
-                        - ./space/.env
+                environment:
+                        - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
                 depends_on:
                         - api
                         - worker
@@ -26,22 +29,94 @@ services:
 
         api:
                 container_name: api
+                platform: linux/amd64
                 image: makeplane/plane-backend:latest
                 restart: always
                 command: ./bin/takeoff
-                env_file:
-                        - ./apiserver/.env
+                environment:
+                        - DEBUG=${DEBUG:-0}
+                        - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
+                        - SENTRY_DSN=${SENTRY_DSN:-""}
+                        - PGUSER=${PGUSER:-plane}
+                        - PGPASSWORD=${PGPASSWORD:-plane}
+                        - PGHOST=${PGHOST:-plane-db}
+                        - PGDATABASE=${PGDATABASE:-plane}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - REDIS_HOST=${REDIS_HOST:-plane-redis}
+                        - REDIS_PORT=${REDIS_PORT:-6379}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - EMAIL_HOST=${EMAIL_HOST:-""}
+                        - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
+                        - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
+                        - EMAIL_PORT=${EMAIL_PORT:-587}
+                        - EMAIL_FROM=${EMAIL_FROM:-Team Plane <team@mailer.plane.so>}
+                        - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
+                        - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
+                        - AWS_REGION=${AWS_REGION:-""}
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+                        - OPENAI_API_KEY=${OPENAI_API_KEY:-sk-}
+                        - GPT_ENGINE=${GPT_ENGINE:-gpt-3.5-turbo}
+                        - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
+                        - DOCKERIZED=${DOCKERIZED:-1}
+                        - USE_MINIO=${USE_MINIO:-1}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
+                        - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+                        - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
+                        - ENABLE_EMAIL_PASSWORD=${ENABLE_EMAIL_PASSWORD:-1}
+                        - ENABLE_MAGIC_LINK_LOGIN=${ENABLE_MAGIC_LINK_LOGIN:-0}
+                        - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
                 depends_on:
                         - plane-db
                         - plane-redis
 
         worker:
                 container_name: bgworker
+                platform: linux/amd64
                 image: makeplane/plane-backend:latest
                 restart: always
                 command: ./bin/worker
-                env_file:
-                        - ./apiserver/.env
+                environment:
+                        - DEBUG=${DEBUG:-0}
+                        - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
+                        - SENTRY_DSN=${SENTRY_DSN:-""}
+                        - PGUSER=${PGUSER:-plane}
+                        - PGPASSWORD=${PGPASSWORD:-plane}
+                        - PGHOST=${PGHOST:-plane-db}
+                        - PGDATABASE=${PGDATABASE:-plane}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - REDIS_HOST=${REDIS_HOST:-plane-redis}
+                        - REDIS_PORT=${REDIS_PORT:-6379}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - EMAIL_HOST=${EMAIL_HOST:-""}
+                        - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
+                        - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
+                        - EMAIL_PORT=${EMAIL_PORT:-587}
+                        - EMAIL_FROM=${EMAIL_FROM:-Team Plane <team@mailer.plane.so>}
+                        - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
+                        - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
+                        - AWS_REGION=${AWS_REGION:-""}
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+                        - OPENAI_API_KEY=${OPENAI_API_KEY:-sk-}
+                        - GPT_ENGINE=${GPT_ENGINE:-gpt-3.5-turbo}
+                        - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
+                        - DOCKERIZED=${DOCKERIZED:-1}
+                        - USE_MINIO=${USE_MINIO:-1}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
+                        - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+                        - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
+                        - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
                 depends_on:
                         - api
                         - plane-db
@@ -49,11 +124,46 @@ services:
 
         beat-worker:
                 container_name: beatworker
+                platform: linux/amd64
                 image: makeplane/plane-backend:latest
                 restart: always
                 command: ./bin/beat
-                env_file:
-                        - ./apiserver/.env
+                environment:
+                        - DEBUG=${DEBUG:-0}
+                        - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
+                        - SENTRY_DSN=${SENTRY_DSN:-""}
+                        - PGUSER=${PGUSER:-plane}
+                        - PGPASSWORD=${PGPASSWORD:-plane}
+                        - PGHOST=${PGHOST:-plane-db}
+                        - PGDATABASE=${PGDATABASE:-plane}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - REDIS_HOST=${REDIS_HOST:-plane-redis}
+                        - REDIS_PORT=${REDIS_PORT:-6379}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - EMAIL_HOST=${EMAIL_HOST:-""}
+                        - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
+                        - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
+                        - EMAIL_PORT=${EMAIL_PORT:-587}
+                        - EMAIL_FROM=${EMAIL_FROM:-Team Plane <team@mailer.plane.so>}
+                        - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
+                        - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
+                        - AWS_REGION=${AWS_REGION:-""}
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+                        - OPENAI_API_KEY=${OPENAI_API_KEY:-sk-}
+                        - GPT_ENGINE=${GPT_ENGINE:-gpt-3.5-turbo}
+                        - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
+                        - DOCKERIZED=${DOCKERIZED:-1}
+                        - USE_MINIO=${USE_MINIO:-1}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
+                        - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+                        - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
+                        - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
                 depends_on:
                         - api
                         - plane-db
@@ -67,13 +177,11 @@ services:
                 command: postgres -c 'max_connections=1000'
                 volumes:
                         - pgdata:/var/lib/postgresql/data
-                env_file:
-                        - .env
                 environment:
-                        POSTGRES_USER: ${PGUSER}
-                        POSTGRES_DB: ${PGDATABASE}
-                        POSTGRES_PASSWORD: ${PGPASSWORD}
-                        PGDATA: /var/lib/postgresql/data
+                        - POSTGRES_USER=${POSTGRES_USER:-plane}
+                        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-plane}
+                        - POSTGRES_DB=${POSTGRES_DB:-plane}
+                        - PGDATA=${PGDATA:-/var/lib/postgresql/data}
 
         plane-redis:
                 container_name: plane-redis
@@ -89,32 +197,32 @@ services:
                 command: server /export --console-address ":9090"
                 volumes:
                         - uploads:/export
-                env_file:
-                        - .env
                 environment:
-                        MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
-                        MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
+                        - MINIO_ROOT_USER=${MINIO_ROOT_USER:-access-key}
+                        - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-secret-key}
 
         createbuckets:
                 image: minio/mc
                 entrypoint: >
                         /bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY; /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME; /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; exit 0; "
-                env_file:
-                        - .env
+                environment:
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
                 depends_on:
                         - plane-minio
 
         # Comment this if you already have a reverse proxy running
         proxy:
                 container_name: proxy
+                platform: linux/amd64
                 image: makeplane/plane-proxy:latest
                 ports:
                         - ${NGINX_PORT}:80
-                env_file:
-                        - .env
                 environment:
-                        FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
-                        BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
                 depends_on:
                         - web
                         - api