diff --git a/.env.example b/.env.example
index 35c5f83d3..746a5b9d7 100644
--- a/.env.example
+++ b/.env.example
@@ -53,6 +53,8 @@ GITHUB_CLIENT_SECRET="" # For fetching release notes
 
 # Settings related to Docker
 DOCKERIZED=1
+# set to 1 If using the pre-configured minio setup 
+USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index 1bdd41d07..9decf871e 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -14,8 +14,6 @@ services:
                         NEXT_PUBLIC_SENTRY_DSN: 0
                         NEXT_PUBLIC_ENABLE_OAUTH: 0
                         NEXT_PUBLIC_ENABLE_SENTRY: 0
-                ports:
-                        - 3000:3000
 
         plane-api:
                 container_name: planebackend
@@ -45,12 +43,10 @@ services:
                         SECRET_KEY: ${SECRET_KEY}
                         DEFAULT_EMAIL: ${DEFAULT_EMAIL}
                         DEFAULT_PASSWORD: ${DEFAULT_PASSWORD}
-                        USE_MINIO: 1
+                        USE_MINIO: ${USE_MINIO}
                 depends_on:
                         - plane-db
                         - plane-redis
-                ports:
-                        - 8000:8000
 
         plane-worker:
                 container_name: planerqworker
@@ -80,7 +76,7 @@ services:
                         SECRET_KEY: ${SECRET_KEY}
                         DEFAULT_EMAIL: ${DEFAULT_EMAIL}
                         DEFAULT_PASSWORD: ${DEFAULT_PASSWORD}
-                        USE_MINIO: 1
+                        USE_MINIO: ${USE_MINIO}
                 depends_on:
                         - plane-api
                         - plane-db
@@ -114,8 +110,6 @@ services:
                   MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
                   MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
                 command: server /export --console-address ":9090"
-                ports:
-                      - 9000:9000
 
         createbuckets:
                 image: minio/mc
@@ -130,11 +124,9 @@ services:
                   "
 
 # Comment this if you already have a reverse proxy running
-        nginx:
-          container_name: nginx
-          build:
-            context: ./nginx
-            dockerfile: Dockerfile
+        plane-proxy:
+          container_name: planeproxy
+          image: makeplane/plane-proxy:latest
           ports:
             - ${NGINX_PORT}:80
           depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index 19f95f875..1c5a80f15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
                 environment:
                         DJANGO_SETTINGS_MODULE: plane.settings.production
                         DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}:5432/${PGDATABASE}
-                        REDIS_URL: redis://redis:6379/
+                        REDIS_URL: redis://plane-redis:6379/
                         EMAIL_HOST: ${EMAIL_HOST}
                         EMAIL_HOST_USER: ${EMAIL_HOST_USER}
                         EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
@@ -52,7 +52,7 @@ services:
                         SECRET_KEY: ${SECRET_KEY}
                         DEFAULT_EMAIL: ${DEFAULT_EMAIL}
                         DEFAULT_PASSWORD: ${DEFAULT_PASSWORD}
-                        USE_MINIO: 1
+                        USE_MINIO: ${USE_MINIO}
                 depends_on:
                         - plane-db
                         - plane-redis
@@ -67,7 +67,7 @@ services:
                 environment:
                         DJANGO_SETTINGS_MODULE: plane.settings.production
                         DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}:5432/${PGDATABASE}
-                        REDIS_URL: redis://redis:6379/
+                        REDIS_URL: redis://plane-redis:6379/
                         EMAIL_HOST: ${EMAIL_HOST}
                         EMAIL_HOST_USER: ${EMAIL_HOST_USER}
                         EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
@@ -88,7 +88,7 @@ services:
                         SECRET_KEY: ${SECRET_KEY}
                         DEFAULT_EMAIL: ${DEFAULT_EMAIL}
                         DEFAULT_PASSWORD: ${DEFAULT_PASSWORD}
-                        USE_MINIO: 1
+                        USE_MINIO: ${USE_MINIO}
                 depends_on:
                         - plane-api
                         - plane-db
@@ -108,7 +108,7 @@ services:
                         PGDATA: /var/lib/postgresql/data
 
         plane-redis:
-                container_name: redis
+                container_name: plane-redis
                 image: redis:6.2.7-alpine
                 restart: always
                 volumes:
@@ -137,8 +137,8 @@ services:
                 depends_on:
                         - plane-minio
 
-        nginx:
-                container_name: nginx
+        plane-proxy:
+                container_name: planeproxy
                 build:
                   context: ./nginx
                   dockerfile: Dockerfile