diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..0ff739b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Something is broken or not working
+labels: bug
+---
+
+**Describe the bug:**
+<!-- What went wrong? -->
+
+**Error output:**
+<!-- Paste the error here -->
+
+**To reproduce:**
+1. Run `zap ...`
+2. See error
+
+**Expected behavior:**
+<!-- What should have happened? -->
+
+**Environment:**
+- OS:
+- Node version: (run `node -v`)
+- zap-search version: (run `zap --version`)
\ 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 0000000..c3fbe02
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature Request
+about: Suggest a new feature or improvement
+labels: enhancement
+---
+
+**What problem does this solve:**
+<!-- Why do you need this? What pain point does it fix? -->
+
+**What you want:**
+<!-- Describe the feature clearly -->
+
+**Example usage:**
+<!-- How would someone use it? -->
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..067f4cb
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,20 @@
+## lINK ISSUE (if any) : 
+
+## What does this PR do?
+<!-- Brief description of changes -->
+
+## Type of change
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Breaking change
+- [ ] Documentation update
+
+## How to test?
+<!-- Steps to test your changes locally -->
+1. `npm install -g zap-search`
+2. Run `zap ...`
+
+## Checklist
+- [ ] I have tested this locally
+- [ ] I have updated the README if needed
+- [ ] Build passes (`npm run build`)
\ No newline at end of file
diff --git a/apps/cli/package-lock.json b/apps/cli/package-lock.json
index 42ccc46..f6544be 100644
--- a/apps/cli/package-lock.json
+++ b/apps/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "zap-search",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "zap-search",
-      "version": "1.0.6",
+      "version": "1.0.7",
       "license": "MIT",
       "dependencies": {
         "commander": "^14.0.3",