diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9383894..1b2159b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -80,19 +80,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: app-yml
-    attributes:
-      label: App Configuration (app.yml)
-      description: |
-        Please share relevant parts of your app.yml (remove any sensitive information).
-        This helps us understand your app setup.
-      render: yaml
-      placeholder: |
-        name: my-ocp-app
-        version: 1.0.0
-        functions: [...]
-
   - type: textarea
     id: logs
     attributes:
@@ -120,12 +107,3 @@ body:
         - Browser: Chrome 120
         - Using nvm: Yes/No
         - Working directory structure: ...
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our Code of Conduct
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index e101eba..97f6912 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -28,32 +28,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives Considered
-      description: Describe any alternative solutions or features you've considered
-      placeholder: "I also thought about... but..."
-
-  - type: dropdown
-    id: feature-area
-    attributes:
-      label: Feature Area
-      description: Which area of the tool does this feature relate to?
-      options:
-        - UI/Interface
-        - Functions Testing
-        - Jobs Testing
-        - Sources/Destinations
-        - Settings/Configuration
-        - Logging/Debugging
-        - Build System
-        - CLI/Commands
-        - Documentation
-        - Other
-    validations:
-      required: true
-
   - type: dropdown
     id: priority
     attributes:
@@ -90,11 +64,3 @@ body:
       label: Additional Context
       description: Add any other context about the feature request here
 
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our Code of Conduct
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true
diff --git a/.github/ISSUE_TEMPLATE/feedback.yml b/.github/ISSUE_TEMPLATE/feedback.yml
index 0440581..3ee1500 100644
--- a/.github/ISSUE_TEMPLATE/feedback.yml
+++ b/.github/ISSUE_TEMPLATE/feedback.yml
@@ -91,12 +91,3 @@ body:
       description: Optional - would you like us to reach out for more details?
       options:
         - label: I'm open to discussing this feedback further
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our Code of Conduct
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true