diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..4f4887bba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+<!-- 
+Briefly describe the issue and expected behavior.  Keep it short but clear to help identify the problem quickly. 
+-->
+## Description
+Briefly describe the issue and what you expected to happen.  
+
+<!-- 
+Specify the environment details where the issue occurred. Helps to determine if the bug is environment-specific. 
+-->
+## Environment
+- **OS:** (e.g., Windows 10, macOS Ventura)
+- **Browser/Version:** (if applicable)
+- **Version:** (e.g., v1.2.3)  
+
+<!-- 
+List the steps to reproduce the issue. This helps others replicate the bug consistently. 
+-->
+## Steps to Reproduce
+1. Go to '...'
+2. Click on '...'
+3. See the issue  
+
+<!-- 
+Describe the difference between the expected and actual outcomes. This helps clarify the impact of the bug. 
+-->
+## Expected vs Actual Behavior
+- **Expected:** What should happen  
+- **Actual:** What actually happens  
+
+<!-- 
+(Optional) Add supporting materials like screenshots or logs to provide more context about the issue. 
+-->
+## Attachments (Optional)
+Add screenshots, logs, or relevant files if needed.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..a4492254a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://lists.apache.org/list.html?dev@baremaps.apache.org
+    about: Please ask and answer questions here
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..da50ad96c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- 
+Clearly explain the feature you’re requesting. Focus on what it does and why it’s needed. 
+-->
+## Description
+Clearly explain the feature you’d like to see.  
+
+<!-- 
+Describe how and where this feature will be used. Provides context for its practical application. 
+-->
+## Use Case
+Why is this feature needed? How will it be used?  
+
+<!-- 
+Explain the positive outcomes this feature will bring. Helps prioritize based on impact. 
+-->
+## Expected Impact
+What benefits will this feature bring?