diff --git a/fastapi/Dockerfile b/fastapi/Dockerfile
index 2823288..5bdc6e3 100644
--- a/fastapi/Dockerfile
+++ b/fastapi/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8
 
 WORKDIR /app
 
@@ -7,6 +7,5 @@ RUN apt update
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY . .
+COPY ./app ./app
 
-CMD ["uvicorn", "--host", "0.0.0.0", "--port", "8000", "src.app:app"]
\ No newline at end of file
diff --git a/fastapi/README.md b/fastapi/README.md
index 5c26484..42ebacc 100644
--- a/fastapi/README.md
+++ b/fastapi/README.md
@@ -7,8 +7,8 @@ Project structure:
 ├── docker-compose.yaml
 ├── Dockerfile
 ├── requirements.txt
-├── src
-    ├── app.py
+├── app
+    ├── main.py
     ├── __init__.py
 
 ```
@@ -18,12 +18,14 @@ Project structure:
 version: '3.7'
 services:
   api:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: fastapi-service
+    build: .
+    container_name: fastapi-application
+    environment:
+      PORT: 8000
     ports:
       - '8000:8000'
+    restart: "no"
+
 ```
 
 ## Deploy with docker-compose
@@ -36,8 +38,8 @@ docker-compose up -d --build
 Listing containers must show one container running and the port mapping as below:
 ```
 $ docker ps
-CONTAINER ID   IMAGE         COMMAND                  CREATED              STATUS              PORTS                    NAMES
-69893120c355   fastapi_api   "uvicorn --host 0.0.…"   About a minute ago   Up About a minute   0.0.0.0:8000->8000/tcp   fastapi-service
+CONTAINER ID   IMAGE          COMMAND       CREATED              STATUS              PORTS                                               NAMES
+7087a6e79610   5c1778a60cf8   "/start.sh"   About a minute ago   Up About a minute   80/tcp, 0.0.0.0:8000->8000/tcp, :::8000->8000/tcp   fastapi-application
 ```
 
 After the application starts, navigate to `http://localhost:8000` in your web browser and you should see the following json response:
diff --git a/fastapi/src/__init__.py b/fastapi/app/__init__.py
similarity index 100%
rename from fastapi/src/__init__.py
rename to fastapi/app/__init__.py
diff --git a/fastapi/src/app.py b/fastapi/app/main.py
similarity index 68%
rename from fastapi/src/app.py
rename to fastapi/app/main.py
index f3084da..9f6ec44 100644
--- a/fastapi/src/app.py
+++ b/fastapi/app/main.py
@@ -1,11 +1,8 @@
 from fastapi import FastAPI
-import uvicorn
 
-app = FastAPI(debug=True)
+app = FastAPI()
 
 
 @app.get("/")
 def hello_world():
     return {"message": "OK"}
-
-
diff --git a/fastapi/docker-compose.yml b/fastapi/docker-compose.yml
index 147db4d..fab287e 100644
--- a/fastapi/docker-compose.yml
+++ b/fastapi/docker-compose.yml
@@ -1,9 +1,11 @@
 version: '3.7'
 services:
   api:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: fastapi-service
+    build: .
+    container_name: fastapi-application
+    environment:
+      PORT: 8000
     ports:
       - '8000:8000'
+    restart: "no"
+