diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee7daed..578ddbe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,8 +4,6 @@ jobs:
     machine:
       image: ubuntu-1604:202007-01
 
-    working_directory: ~/app
-
     steps:
       - checkout
 
@@ -22,20 +20,15 @@ jobs:
             docker-compose build
 
       - run:
-          name: Up Docker container
+          name: Up Docker containers and Confirm logs
           command: |
             set -x
             docker-compose up -d
-            docker-compose run --rm app sh -c "python --version && poetry --version"
-
-      # - run:
-      #     name: Run Docker container
-      #     command: |
-      #       set -x
-      #       docker-compose up -d
-      #       sleep 10
-      #       docker ps -f status=running
-      #       docker-compose logs
+            sleep 5
+            docker ps -f status=running
+            docker-compose logs
+            docker-compose run --rm app bash -c "python --version && poetry --version"
+            docker-compose run --rm db bash -c "psql --version"
 
       - run:
           name: Run Pytest
diff --git a/.gitignore b/.gitignore
index b6e4761..c68cec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# Setting by User
+db/tmp
diff --git a/db/.gitkeep b/db/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/db/Dockerfile b/db/Dockerfile
index 86e000f..08e46cb 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,4 +1,3 @@
 FROM postgres:12-alpine
 
-EXPOSE 5432
-CMD ["postgres"]
+ENV LANG ja_JP.utf8
diff --git a/docker-compose.yml b/docker-compose.yml
index 66fa880..faa2962 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,5 @@
 version: "3"
 services:
-  postgres:
-    build: ./db
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=password
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./db/data/postgres:/var/lib/postgresql/data
   app:
     build: ./app
     user: root
@@ -24,3 +15,14 @@ services:
         --allow-root
         --NotebookApp.token=''
         --no-browser
+  db:
+    build: ./db
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=testdb
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./db/tmp/postgres/data:/var/lib/postgresql/data
+    restart: always