diff --git a/docker-compose.yml b/docker-compose.yml
index aac42cb..cdc23d7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,20 +3,24 @@ services:
     build: .
     container_name: rg-website-cms
     ports:
-      - "1337:1337"
+      - "${PORT}:1337"
     environment:
-      DATABASE_CLIENT: postgres
-      DATABASE_HOST: postgres
-      DATABASE_PORT: 5432
-      DATABASE_NAME: strapi
-      DATABASE_USERNAME: strapi
-      DATABASE_PASSWORD: strapi
+      DATABASE_CLIENT: ${DATABASE_CLIENT}
+      DATABASE_HOST: ${DATABASE_HOST}
+      DATABASE_PORT: ${DATABASE_PORT}
+      DATABASE_NAME: ${DATABASE_NAME}
+      DATABASE_USERNAME: ${DATABASE_USERNAME}
+      DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+      DATABASE_SSL: ${DATABASE_SSL}
+      NODE_ENV: ${NODE_ENV}
       APP_KEYS: ${APP_KEYS}
       API_TOKEN_SALT: ${API_TOKEN_SALT}
       ADMIN_JWT_SECRET: ${ADMIN_JWT_SECRET}
       TRANSFER_TOKEN_SALT: ${TRANSFER_TOKEN_SALT}
+      JWT_SECRET: ${JWT_SECRET}
+      CORS_ORIGIN: ${CORS_ORIGIN}
     volumes:
-      - strapi:/srv/app
+      - strapi_uploads:/app/public/uploads
     depends_on:
       - postgres
 
@@ -31,5 +35,5 @@ services:
       - postgres_data:/var/lib/postgresql/data
 
 volumes:
-  strapi:
+  strapi_uploads:
   postgres_data: