diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ce6eb42..bd0ceff 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,18 +1,6 @@
 spring:
   application:
     name: codeplay
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: ${SPRING_MAIL_USERNAME}  # 이메일 계정
-    password: ${SPRING_MAIL_PASSWORD}
-    protocol: smtp
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
 
   config:
     import:
@@ -48,6 +36,19 @@ spring:
         access-key: ${AWS_ACCESS_KEY_ID}
         secret-key: ${AWS_SECRET_ACCESS_KEY}
 
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: ${SPRING_MAIL_USERNAME}  # 이메일 계정
+    password: ${SPRING_MAIL_PASSWORD}
+    protocol: smtp
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+
 s3:
   bucket: ${S3_BUCKET}
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 57578e4..90d1a7d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,6 @@
 spring:
   application:
     name: codeplay
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: ${SPRING_MAIL_USERNAME}  # 이메일 계정
-    password: ${SPRING_MAIL_PASSWORD}
-    protocol: smtp
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
 
   config:
     import:
@@ -40,6 +28,19 @@ spring:
         use_sql_comments: true
         default_batch_fetch_size: 1000  # 배치 크기 설정 (성능 최적화)
 
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: ${SPRING_MAIL_USERNAME}  # 이메일 계정
+    password: ${SPRING_MAIL_PASSWORD}
+    protocol: smtp
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+
   cloud:
     aws:
       region: