diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 75d5d7e..0000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Bug Report
-description: Report a bug
-labels: [bug]
-title: '[Bug]:'
-body:
-
-- type: textarea
-  id: description
-  attributes:
-  description: 버그 사항 기술
-  label: Bug description
-  validations:
-  required: true
-
-- type: textarea
-  id: expected
-  attributes:
-  label: 기대되는 결과
-
-- type: textarea
-  id: reproduction-steps
-  attributes:
-  label: To Reproduce
-  description: 재현 방법
-  placeholder: |
-  최소한으로 재현 가능한 코드 또는 재현 단계를 설명해주세요. 선택 사항이지만 권장됩니다.
-
-- type: textarea
-  id: possible-solution
-  attributes:
-  label: 제안 솔루션
-  placeholder: I think this is probably...
-  validations:
-  required: false
-
-- type: textarea
-  id: etc
-  attributes:
-  label: etc.
-  validations:
-  required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..88afb60
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,40 @@
+name: Bug Report
+description: Report a bug
+labels: [bug]
+title: '[Bug]: '
+body:
+  - type: textarea
+    id: description
+    attributes:
+      description: 버그에 대해서 설명해주세요.
+      label: Bug description
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: To Reproduce
+      description: 재현 방법을 자세히 알려주세요. 특정 환경에서만 발생하는 것 같다면, JDK와 실행 환경에 대한 정보도 함께 제공해주세요.
+      placeholder: |
+        최소한으로 재현 가능한 코드 또는 재현 단계를 설명해주세요. 선택 사항이지만 권장됩니다.
+
+  - type: textarea
+    id: possible-solution
+    attributes:
+      label: Possible Solution
+      placeholder: I think this is probably...
+    validations:
+      required: false
+
+  - type: textarea
+    id: etc
+    attributes:
+      label: etc.
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feat.md b/.github/ISSUE_TEMPLATE/feat.md
deleted file mode 100644
index e57d1b8..0000000
--- a/.github/ISSUE_TEMPLATE/feat.md
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Feature
-description: Add New Feature
-labels: [feat]
-title: '[Feat]:'
-body:
-
-- type: textarea
-  id: description
-  attributes:
-  description: 구현할 기능을 설명해주세요.
-  label: Description
-  validations:
-  required: true
-
-- type: textarea
-  id: possible-solution
-  attributes:
-  label: Possible Solution
-  placeholder: I think this is probably...
-  validations:
-  required: false
-
-- type: textarea
-  id: etc
-  attributes:
-  label: etc.
-  validations:
-  required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index c58b2df..0000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Feature Request
-description: Suggest an idea
-labels: [feat]
-title: '[Feat]:'
-body:
-
-- type: textarea
-  id: description
-  attributes:
-  description: 원하시는 기능을 설명해주세요.
-  label: Description
-  validations:
-  required: true
-
-- type: textarea
-  id: possible-solution
-  attributes:
-  label: Possible Solution
-  placeholder: I think this is probably...
-  validations:
-  required: false
-
-- type: textarea
-  id: etc
-  attributes:
-  label: etc.
-  validations:
-  required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..d981b1b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,27 @@
+name: Feature Request
+description: Suggest an idea
+labels: [feat]
+title: '[Feat]: '
+body:
+  - type: textarea
+    id: description
+    attributes:
+      description: 원하시는 기능을 설명해주세요.
+      label: Description
+    validations:
+      required: true
+
+  - type: textarea
+    id: possible-solution
+    attributes:
+      label: Possible Solution
+      placeholder: I think this is probably...
+    validations:
+      required: false
+
+  - type: textarea
+    id: etc
+    attributes:
+      label: etc.
+    validations:
+      required: false
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index d99160b..af5d75c 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - develop
   pull_request:
     branches:
       - develop