diff --git a/docker-compose.yml b/docker-compose.yml
index 0789caa..3ca49ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,9 +13,11 @@ services:
     volumes:
       - /home/argo/Perfume-project/Docker:/app/data
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     networks:
       - perfume-network
+    restart: unless-stopped
 
   db:
     image: mysql:8.0
@@ -23,16 +25,24 @@ services:
     ports:
       - "3306:3306"
     environment:
-      - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}  # root 비밀번호 설정
+      - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
       - MYSQL_DATABASE=perfumePedia
+      - MYSQL_USER=${DB_USERNAME}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
     volumes:
       - mysql_data:/var/lib/mysql
     networks:
       - perfume-network
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u${DB_USERNAME}", "-p${DB_PASSWORD}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
 
 volumes:
   mysql_data:
 
 networks:
   perfume-network:
-    driver: bridge
+    driver: bridge
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0bd052a..bd770e0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,22 +2,27 @@ spring:
   application:
     name: perfumepedia-backend
   datasource:
-    url:  jdbc:mysql://db:3306/perfumePedia?serverTimezone=UTC&characterEncoding=UTF-8
-#    url: jdbc:mysql://localhost:3306/PerfumeProject?serverTimezone=UTC&characterEncoding=UTF-8
+    url: jdbc:mysql://db:3306/perfumePedia?serverTimezone=UTC&characterEncoding=UTF-8
+    #    url: jdbc:mysql://localhost:3306/PerfumeProject?serverTimezone=UTC&characterEncoding=UTF-8
+
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 5
+      minimum-idle: 2
+      initialization-fail-timeout: 30000
 
   jpa:
     hibernate:
-      ddl-auto: update  # 스키마 자동 업데이트 설정
-    show-sql: true  # SQL 쿼리 출력
+      ddl-auto: update
+    show-sql: true
     properties:
       hibernate:
         format_sql: true
+        dialect: org.hibernate.dialect.MySQL8Dialect
     database-platform: org.hibernate.dialect.MySQL8Dialect
 
-
 springdoc:
   api-docs:
     path: /v3/api-docs
@@ -35,5 +40,4 @@ logging:
     org.hibernate: "info"
     org:
       springframework:
-        security: "trace"
-
+        security: "trace"
\ No newline at end of file