diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..181874fc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,71 @@
+name: "Bug report"
+description: "Report a bug or issue with Foblex Flow"
+title: "Bug: [Short Description]"
+labels:
+  - bug
+assignees:
+  - siarheihuzarevich
+  - markwojno
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: "Description"
+      description: "Please provide a clear and concise description of the bug."
+      placeholder: "Enter the bug description here"
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: "Steps to Reproduce"
+      description: "Describe the steps to reproduce the bug."
+      placeholder: "1. Go to ... \n2. Click on ... \n3. Scroll down to ... \n4. See error"
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected_result
+    attributes:
+      label: "Expected Result"
+      description: "Describe what you expected to happen."
+      placeholder: "Enter the expected result here"
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual_result
+    attributes:
+      label: "Actual Result"
+      description: "Describe what actually happened."
+      placeholder: "Enter the actual result here"
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: "Environment Details"
+      description: "Specify the browser, library version, Angular version, and any other relevant details."
+      placeholder: "Browser: \nLibrary Version: \nAngular Version: \nOther details: "
+    validations:
+      required: true
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: "Screenshots or Videos"
+      description: "Add any screenshots that might help explain the problem."
+      placeholder: "Enter any additional context here"
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional Context"
+      description: "Add any other context about the problem here."
+      placeholder: "Enter any additional context here"
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 070b92d4..1dba3fa0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -14,22 +14,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: justification
-    attributes:
-      label: Justification
-      description: Explain why this feature is important and how it will benefit users.
-    validations:
-      required: false
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives
-      description: Describe any alternative solutions or features you've considered.
-    validations:
-      required: false
-
   - type: textarea
     id: additional_context
     attributes: