diff --git a/Dockerfile b/Dockerfile
index affc5a2..283663e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,4 +9,4 @@ WORKDIR /todo_api
 COPY --from=builder /todo_api ./
 RUN yarn install --production=true
 EXPOSE 8080
-ENTRYPOINT ["yarn", "serve"]
\ No newline at end of file
+ENTRYPOINT ["yarn"]
\ No newline at end of file
diff --git a/README.md b/README.md
index fc4f5d9..db44f32 100644
--- a/README.md
+++ b/README.md
@@ -8,35 +8,23 @@ Make sure you have [Docker](https://www.docker.com/) installed
 
 ### Setting up
 
-**Commands**
-
-To install the database management, run:
-
-```bash
-docker-compose up -d
-```
-
-To create database, run:
-
-```bash
-docker exec -it todo psql -U postgres -c "create database todo"
-```
-
 **.env file**
 
 1. Create the `.env` file
 2. Copy and parse the `connection information` below:
 
 ```bash
-DB_USER=postgres
-DB_HOST=localhost
-DB_DATABASE=todo
-DB_PORT=54320
+POSTGRES_USER=docker
+POSTGRES_PASSWORD=docker
+POSTGRES_HOST=localhost
+POSTGRES_DB=todo
+POSTGRES_PORT=54320
 ```
 
-## Create tables
-
-Open and run the `database/sql/database.sql` by postgres tools (i.e. [pgAdmin](https://www.pgadmin.org/))
+**database**
+```bash
+docker-compose up -d
+```
 
 ## Seeding data
 
diff --git a/database/sql/database.sql b/database/sql/database.sql
index f839aa4..0a06b6b 100644
--- a/database/sql/database.sql
+++ b/database/sql/database.sql
@@ -1,5 +1,3 @@
-create database todo;
-
 create table todo_list
 (
   id serial primary key not null,
diff --git a/docker-compose.yml b/docker-compose.yml
index e2edd68..861f8f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,9 @@ services:
   db:
     image: "postgres:11"
     container_name: "todo"
+    env_file:
+    - ./.env
     ports:
     - "54320:5432"
     volumes:
-    - todo:/var/lib/postgresql/data
-volumes:
-  todo:
\ No newline at end of file
+    - ./database/sql/database.sql:/docker-entrypoint-initdb.d/database.sql
diff --git a/scripts/seed/db/connect.ts b/scripts/seed/db/connect.ts
index 4d66e4a..7282dc7 100644
--- a/scripts/seed/db/connect.ts
+++ b/scripts/seed/db/connect.ts
@@ -3,11 +3,11 @@ require('dotenv').config();
 
 function connect() {
   return new Pool({
-    user: process.env.DB_USER,
-    host: process.env.DB_HOST,
-    database: process.env.DB_DATABASE,
-    password: process.env.DB_PASSWORD,
-    port: process.env.DB_PORT,
+    user: process.env.POSTGRES_USER,
+    host: process.env.POSTGRES_HOST,
+    database: process.env.POSTGRES_DB,
+    password: process.env.POSTGRES_PASSWORD,
+    port: process.env.POSTGRES_PORT,
   });
 }
 
diff --git a/src/db/connect.ts b/src/db/connect.ts
index e08f10d..49991d6 100644
--- a/src/db/connect.ts
+++ b/src/db/connect.ts
@@ -3,10 +3,10 @@ require('dotenv').config();
 
 export function connect() {
   return new Pool({
-    user: process.env.DB_USER,
-    host: process.env.DB_HOST,
-    database: process.env.DB_DATABASE,
-    password: process.env.DB_PASSWORD,
-    port: process.env.DB_PORT,
+    user: process.env.POSTGRES_USER,
+    host: process.env.POSTGRES_HOST,
+    database: process.env.POSTGRES_DB,
+    password: process.env.POSTGRES_PASSWORD,
+    port: process.env.POSTGRES_PORT,
   });
 }