diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..4e66e85f8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Report a bug
+title: ''
+labels: bug
+assignees: ''
+---
+
+## Bug Description
+
+A clear description of what the bug is.
+
+## Expected Behavior
+
+What you expected to happen.
+
+## Actual Behavior
+
+What actually happened.
+
+## Steps to Reproduce
+
+1.
+2.
+3.
+
+## Environment
+
+- Version:
+- Java version:
+- OS:
+
+## Additional Context
+
+Any other relevant information.
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 000000000..161d89503
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,23 @@
+---
+name: Enhancement
+about: Suggest an enhancement or new feature
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+## Enhancement Description
+
+A clear description of the enhancement or feature you'd like to see.
+
+## Use Case
+
+Describe the use case or problem this enhancement would solve.
+
+## Proposed Solution
+
+Describe how you envision this working (if you have ideas).
+
+## Additional Context
+
+Any other relevant information.