diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index f32660170..61a0e143a 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,7 +1,9 @@
 name: Bug Report
 description: File a bug report
 title: "bug: <title>"
-labels: ["kind/Bug", "valuestream/SDK"]
+type: Bug
+assignees:
+  - edgarrmondragon
 
 body:
   - type: markdown
@@ -29,13 +31,12 @@ body:
       label: Python Version
       description: Version of Python you are using
       options:
+        - "NA"
         - "3.12"
         - "3.11"
         - "3.10"
         - "3.9"
-        - "3.8"
-        - "3.7 or earlier"
-        - "NA"
+        - "3.8 or earlier"
     validations:
       required: true
   - type: dropdown
@@ -60,7 +61,7 @@ body:
       description: What operating system you are using
       placeholder: "Windows"
     validations:
-      required: true
+      required: false
   - type: textarea
     id: what-happened
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/docs.yml b/.github/ISSUE_TEMPLATE/docs.yml
index ca0d9c673..de84539e0 100644
--- a/.github/ISSUE_TEMPLATE/docs.yml
+++ b/.github/ISSUE_TEMPLATE/docs.yml
@@ -2,6 +2,8 @@ name: Documentation change
 description: Request a documentation change
 title: "docs: <title>"
 labels: ["Documentation", "valuestream/SDK"]
+assignees:
+  - edgarrmondragon
 
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index a5afd5974..4715db963 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -2,8 +2,9 @@ name: Feature request
 description: Request a new feature
 title: "feat: <title>"
 labels: ["kind/Feature", "valuestream/SDK"]
+type: Enhancement
 assignees:
-  - meltano/engineering
+  - edgarrmondragon
 
 body:
   - type: markdown
@@ -16,7 +17,8 @@ body:
       label: Feature scope
       description: Functionality this new feature would impact
       options:
-        - Taps (catalog, state, stream maps, tests, etc.)
+        - Taps (catalog, state, tests, etc.)
+        - Inline mapping (stream maps, flattening, etc.)
         - Targets (data type handling, batching, SQL object generation, tests, etc.)
         - Configuration (settings parsing, validation, etc.)
         - CLI (options, error messages, logging, etc.)