diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml
index 3737bf3a..7594247a 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml
@@ -1,5 +1,5 @@
 name: Bug Report 🪲
-description: Create a bug report to help us improve
+description: Report a bug to help us quickly identify and resolve issues.
 title: '[Bug]: '
 labels: bug
 body:
@@ -15,7 +15,7 @@ body:
     attributes:
       label: Given
       description: |
-        Describe your setup. For example:
+        Provide details about your setup, feature files, step definitions, and configuration. For example:
         ````
         I have the following setup:
 
@@ -43,7 +43,7 @@ body:
     attributes:
       label: When
       description: |
-        Describe your actions. For example:
+        Describe the steps you performed to produce the issue. For example:
         ````
         I run the following command:
         ```shell
@@ -54,10 +54,12 @@ body:
 
   - type: textarea
     id: then
+    validations:
+      required: true
     attributes:
       label: Then
       description: |
-        Describe the **actual** result. For example:
+        Provide the **actual** outcome. For example:
         ````
         I see an error:
         ```
@@ -71,22 +73,25 @@ body:
     validations:
       required: true
     attributes:
-      label: But I expect
+      label: Expected Result
       description: |
         Describe the **expected** result. For example:
         ````
         I expect no errors and all tests to pass.
         ````
-      placeholder: What did you expect?
+      placeholder: What did you expect to happen?
 
   - type: input
     id: reproduction-url
+    validations:
+      required: false
     attributes:
-      label: Reproduction demo URL
+      label: Reproduction Demo URL
       description: |
-        You are **highly encouraged** to try reproducing your bug on the [playwright-bdd-example](https://github.com/vitalets/playwright-bdd-example).
-        It significantly reduces the time it takes to resolve your issue.
-      placeholder: https://github.com/%your-name%/playwright-bdd-example
+        You are **highly encouraged** to fork [playwright-bdd-example](https://github.com/vitalets/playwright-bdd-example) and modify it to reproduce the issue.
+        Then push the changes and share the link below.
+        It greatly speeds up issue resolution!
+      placeholder: https://github.com/johndoe/playwright-bdd-example
 
   - type: textarea
     id: envinfo
@@ -105,4 +110,5 @@ body:
         @playwright/test: v1.49.1
         @cucumber/cucumber: none
         Playwright config file: playwright.config.ts
+
       render: shell
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.yml b/.github/ISSUE_TEMPLATE/2-feature-request.yml
new file mode 100644
index 00000000..81ff0a7e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.yml
@@ -0,0 +1,47 @@
+name: Feature Request 🚀
+description: Request a new feature or improvement
+title: '[Feature]: '
+labels: enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for suggesting a new feature! Please fill out the following details to help us understand your request.
+
+        **Note:** Providing as much detail as possible helps us prioritize and design the feature effectively.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Describe the Problem
+      description: Explain the current issue or limitation you’re facing. What challenge does this create?
+      placeholder: Clearly describe the problem or limitation.
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: Describe your idea for addressing the problem. How do you envision this feature working?
+      placeholder: Detail the solution or feature you'd like to see.
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Share any supporting information, such as screenshots, examples, or use cases.
+      placeholder: Provide any additional context or background information.
+
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Priority Level
+      description: How urgent or important is this feature for you?
+      options:
+        - Low
+        - Medium
+        - High
+        - Critical
+      default: Medium
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index e0e186dc..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: 'Bug:'
-labels: bug
-assignees: ''
-
----
-
-**Given**
-<!-- 
-What is your setup: paste your playwright config, feature file and directories structure.
-
-Use backticks to format code snippets with syntax highlight:
-```gherkin
-// your feature here...
-```
-```ts
-// your typescript code here...
-```
--->
-
-**When**
-<!-- What command did you run / any other actions? -->
-
-**Then**
-<!-- What did actually happen? If there is error - please post full error message with stack trace -->
-
-**But I expect**
-<!-- What did you expect? -->
-
-**Isolated demo**
-<!-- Please try to reproduce the bug on the reference repo. It is very helpful for maintainers and drastically increases the response time:
- 1. fork the repo https://github.com/vitalets/playwright-bdd-example
- 2. change code to reproduce bug
- 3. commit, push and create a pull-request to highllight the difference
- 4. post link here
--->
-
-**Environment**
-<!-- Please run `npx bddgen env` and post output here -->
-```
-```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 463dd841..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: 'Feature:'
-labels: enhancement
-assignees: ''
-
----
-
-**The problem**
-<!-- 
-Describe the problem. Please provide sample feature file / step definition / cli command output / screenshots. 
-
-Use backticks to format code snippets with syntax highlight:
-```gherkin
-// your feature here...
-```
-```ts
-// your typescript code here...
-```
--->
-
-**A solution**
-<!-- Suggest a possible solution or any thoughts how to solve the problem. -->