diff --git a/Dockerfile b/Dockerfile
index c83d114..d0d2212 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,11 @@ COPY . ./
 # Install production dependencies.
 RUN pip install --no-cache-dir -r requirements.txt
 
-ENV PORT 5000
-EXPOSE $PORT
+EXPOSE 5000
 
 # Run the web service on container startup. Here we use the gunicorn
 # webserver, with one worker process and 8 threads.
 # For environments with multiple CPU cores, increase the number of workers
 # to be equal to the cores available.
 # Timeout is set to 0 to disable the timeouts of the workers to allow Cloud Run to handle instance scaling.
-CMD exec python app.py
+CMD exec gunicorn --bind 0.0.0.0:5000 --workers 1 --threads 8 --timeout 0 app:app
diff --git a/docker-compose.yml b/docker-compose.yml
index 48c472a..5c9e43e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,5 +6,5 @@ services:
     build: .
     image: ecrop/ielts-be:latest
     ports:
-      - 8080:8080
+      - 8080:5000
     restart: unless-stopped
diff --git a/requirements.txt b/requirements.txt
index 1855f82..7bf8d0a 100644
Binary files a/requirements.txt and b/requirements.txt differ