diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..7a31af1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,8 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
+name: Bug Report
+about: Report something that isn't working
+title: "[BUG] "
+labels: bug
 assignees: ''
 
 ---
@@ -13,26 +13,18 @@ A clear and concise description of what the bug is.
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+2. Click on '...'
+3. See error
 
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+What should happen instead?
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+(If applicable)
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Environment:**
+- Angular Version:
+- ng-openapi Version:
 
 **Additional context**
-Add any other context about the problem here.
+Add logs, links, or other details here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..267719c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,19 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
+name: Feature Request
+about: Suggest a new feature or improvement
+title: "[FEATURE] "
+labels: enhancement
 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 [...]
+Explain what problem this feature would solve. For example: "I'm always frustrated when..."
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+What should be added, changed, or improved?
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+Any workarounds or other features you've thought of?
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context, links, diagrams, or mockups here.
diff --git a/packages/ng-openapi/package.json b/packages/ng-openapi/package.json
index 3a60fb3..1774704 100644
--- a/packages/ng-openapi/package.json
+++ b/packages/ng-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-openapi",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
   "keywords": [
     "angular",