diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..5a0a48cc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/compatibility-certification-request.md b/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
new file mode 100644
index 00000000..f12443a9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
@@ -0,0 +1,27 @@
+---
+name: Compatibility certification request
+about: Request certification of a compatibile implementation of Jakarta EE
+title: Compatibility certification request [CDI]
+labels: certification
+assignees: ''
+
+---
+
+- [ ] Organization Name ("Organization") and, if applicable, URL:<br/>
+  // Add here
+- [ ] Product Name, Version and download URL (if applicable):<br/>
+  // Add here
+- [ ] Specification Name, Version and download URL:<br/>
+  // Add here
+- [ ] TCK Version, digital SHA-256 fingerprint and download URL:<br/>
+  // Add here
+- [ ] Public URL of TCK Results Summary:<br/>
+  // Add here
+- [ ] Any Additional Specification Certification Requirements:<br/>
+  // Add here
+- [ ] Java runtime used to run the implementation:<br/>
+  // Add here
+- [ ] Summary of the information for the certification environment, operating system, cloud, ...:<br/>
+  // Add here
+- [ ] By checking this box I acknowledge that the Organization I represent accepts the terms of the [EFTL](https://www.eclipse.org/legal/tck.php).
+- [ ] By checking this box I attest that all TCK requirements have been met, including any compatibility rules.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..24473dee
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+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 [...]
+
+**Describe the solution you'd like**
+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.
\ No newline at end of file