diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..4ccb3b71a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve CrewAI
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+Provide a clear and concise description of what the bug is.
+
+**Steps to Reproduce**
+Provide a step-by-step process to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Code snippets**
+If applicable, add screenshots or code snippets to help explain your problem.
+
+**Environment Details:**
+- **Operating System**: [e.g., Ubuntu 20.04, macOS Catalina, Windows 10]
+- **Python Version**: [e.g., 3.8, 3.9, 3.10]
+- **crewAI Version**: [e.g., 0.30.11]
+- **crewAI Tools Version**: [e.g., 0.2.6]
+
+**Logs**
+Include relevant logs or error messages if applicable.
+
+**Possible Solution**
+Have a solution in mind? Please suggest it here, or write "None".
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..c578e8daa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest a Feature to improve CrewAI
+title: "[FEAT]"
+labels: feature-request, improvement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+If possible attach the Issue related to it
+
+**Describe the solution you'd like / Use-case**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.