diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
index ae696764..215ad40c 100644
--- a/.github/ISSUE_TEMPLATE/1.bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug_report.yml
@@ -1,94 +1,33 @@
-name: Bug Report
+name: "🐛 Bug Report"
 description: Create a bug report for Umami
-labels: ['template: bug']
+labels: ['bug']
 body:
-  - type: markdown
-    attributes:
-      value: |
-        *Note:* If you leave out sections, the issue might be moved to the ["Help" section](https://github.com/vercel/next.js/discussions/categories/help).
-        [examples](https://github.com/vercel/next.js/tree/canary/examples) related issue should be reported using [this](https://github.com/vercel/next.js/issues/new?assignees=&labels=type%3A+example%2Ctemplate%3A+bug&template=2.example_bug_report.yml) issue template instead.
-        Feature requests should be opened as [discussions](https://github.com/vercel/next.js/discussions/new?category=ideas). [Read more](https://github.com/vercel/next.js/blob/canary/contributing/core/adding-features.md).
-  - type: checkboxes
-    attributes:
-      label: Verify canary release
-      description: 'Please run `npm install next@canary` to try the canary version of Next.js that ships daily. It includes all features and fixes that have not been released to the stable version yet. Some issues may already be fixed in the canary version, so please verify that your issue reproduces before opening a new issue.'
-      options:
-        - label: I verified that the issue exists in the latest Next.js canary release
-          required: true
-  - type: textarea
-    attributes:
-      label: Provide environment information
-      description: Please run `next info` in the root directory of your project and paste the results. You might need to use `npx --no-install next info` if next is not in the current PATH.
-      render: bash
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Which area(s) of Next.js are affected? (leave empty if unsure)
-      multiple: true
-      options:
-        - 'App directory (appDir: true)'
-        - 'CLI (create-next-app)'
-        - 'Data fetching (gS(S)P, getInitialProps)'
-        - 'Dynamic imports (next/dynamic)'
-        - 'ESLint (eslint-config-next)'
-        - 'Font optimization (next/font)'
-        - 'Image optimization (next/image, next/legacy/image)'
-        - 'Internationalization (i18n)'
-        - 'Jest (next/jest)'
-        - 'MDX (@next/mdx)'
-        - 'Metadata (metadata, generateMetadata, next/head, head.js)'
-        - 'Middleware / Edge (API routes, runtime)'
-        - 'Operating System (Windows, MacOS, Linux)'
-        - 'Package manager (npm, pnpm, Yarn)'
-        - 'Routing (next/router, next/navigation, next/link)'
-        - 'Script optimization (next/script)'
-        - 'Standalone mode (output: "standalone")'
-        - 'Static HTML Export (output: "export")'
-        - 'SWC minifier (swcMinify: true)'
-        - 'SWC transpilation'
-        - 'Turbopack (--turbo)'
-        - 'TypeScript (plugin, built-in types)'
-  - type: input
-    attributes:
-      label: Link to the code that reproduces this issue
-      description: |
-        A link to a GitHub repository, a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) or a [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
-        To report an App Router related issue, you can use these templates: [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template-app-dir), [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template-app-dir) or [`npx create-next-app -e reproduction-template-app-dir`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir)
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: To Reproduce
-      description: Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue, based on the linked minimal reproduction. Screenshots can be provided in the issue body below. If using code blocks, make sure that [syntax highlighting is correct](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#syntax-highlighting) and double check that the rendered preview is not broken.
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Describe the Bug
       description: A clear and concise description of what the bug is.
     validations:
       required: true
-  - type: textarea
+  - type: dropdown
     attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - v1
+        - v2
     validations:
       required: true
-  - type: markdown
+    - type: checkboxes
     attributes:
-      value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear.
-  - type: markdown
+      label: Product
+      description: Is this related to Umami Cloud?
+      options:
+        - v1
+        - v2
+    validations:
+      required: true
+  - type: textarea
     attributes:
-      value: Contributors should be able to follow the steps provided in order to reproduce the bug.
-  - type: markdown
-    attributes:
-      value: These steps are used to add integration tests to ensure the same issue does not happen again. Thanks in advance!
-  - type: input
-    attributes:
-      label: Which browser are you using? (if relevant)
-      description: 'Please specify the exact version. For example: Chrome 100.0.4878.0'
-  - type: input
-    attributes:
-      label: How are you deploying your application? (if relevant)
-      description: 'For example: next start, Vercel, Other platform'
\ No newline at end of file
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml
index 52389753..93b6e072 100644
--- a/.github/ISSUE_TEMPLATE/2.feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/2.feature_request.yml
@@ -1,94 +1,24 @@
 name: Feature Request
 description: Create a feature request for Umami
-labels: ['template: bug']
+labels: ['enhancement']
 body:
-  - type: markdown
-    attributes:
-      value: |
-        *Note:* If you leave out sections, the issue might be moved to the ["Help" section](https://github.com/vercel/next.js/discussions/categories/help).
-        [examples](https://github.com/vercel/next.js/tree/canary/examples) related issue should be reported using [this](https://github.com/vercel/next.js/issues/new?assignees=&labels=type%3A+example%2Ctemplate%3A+bug&template=2.example_bug_report.yml) issue template instead.
-        Feature requests should be opened as [discussions](https://github.com/vercel/next.js/discussions/new?category=ideas). [Read more](https://github.com/vercel/next.js/blob/canary/contributing/core/adding-features.md).
-  - type: checkboxes
-    attributes:
-      label: Verify canary release
-      description: 'Please run `npm install next@canary` to try the canary version of Next.js that ships daily. It includes all features and fixes that have not been released to the stable version yet. Some issues may already be fixed in the canary version, so please verify that your issue reproduces before opening a new issue.'
-      options:
-        - label: I verified that the issue exists in the latest Next.js canary release
-          required: true
-  - type: textarea
-    attributes:
-      label: Provide environment information
-      description: Please run `next info` in the root directory of your project and paste the results. You might need to use `npx --no-install next info` if next is not in the current PATH.
-      render: bash
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Which area(s) of Next.js are affected? (leave empty if unsure)
-      multiple: true
-      options:
-        - 'App directory (appDir: true)'
-        - 'CLI (create-next-app)'
-        - 'Data fetching (gS(S)P, getInitialProps)'
-        - 'Dynamic imports (next/dynamic)'
-        - 'ESLint (eslint-config-next)'
-        - 'Font optimization (next/font)'
-        - 'Image optimization (next/image, next/legacy/image)'
-        - 'Internationalization (i18n)'
-        - 'Jest (next/jest)'
-        - 'MDX (@next/mdx)'
-        - 'Metadata (metadata, generateMetadata, next/head, head.js)'
-        - 'Middleware / Edge (API routes, runtime)'
-        - 'Operating System (Windows, MacOS, Linux)'
-        - 'Package manager (npm, pnpm, Yarn)'
-        - 'Routing (next/router, next/navigation, next/link)'
-        - 'Script optimization (next/script)'
-        - 'Standalone mode (output: "standalone")'
-        - 'Static HTML Export (output: "export")'
-        - 'SWC minifier (swcMinify: true)'
-        - 'SWC transpilation'
-        - 'Turbopack (--turbo)'
-        - 'TypeScript (plugin, built-in types)'
-  - type: input
-    attributes:
-      label: Link to the code that reproduces this issue
-      description: |
-        A link to a GitHub repository, a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) or a [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
-        To report an App Router related issue, you can use these templates: [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template-app-dir), [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template-app-dir) or [`npx create-next-app -e reproduction-template-app-dir`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir)
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: To Reproduce
-      description: Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue, based on the linked minimal reproduction. Screenshots can be provided in the issue body below. If using code blocks, make sure that [syntax highlighting is correct](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#syntax-highlighting) and double check that the rendered preview is not broken.
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Describe the Bug
       description: A clear and concise description of what the bug is.
     validations:
       required: true
-  - type: textarea
+  - type: dropdown
     attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - v1
+        - v2
     validations:
       required: true
-  - type: markdown
+  - type: textarea
     attributes:
-      value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear.
-  - type: markdown
-    attributes:
-      value: Contributors should be able to follow the steps provided in order to reproduce the bug.
-  - type: markdown
-    attributes:
-      value: These steps are used to add integration tests to ensure the same issue does not happen again. Thanks in advance!
-  - type: input
-    attributes:
-      label: Which browser are you using? (if relevant)
-      description: 'Please specify the exact version. For example: Chrome 100.0.4878.0'
-  - type: input
-    attributes:
-      label: How are you deploying your application? (if relevant)
-      description: 'For example: next start, Vercel, Other platform'
\ No newline at end of file
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 6a51269f..461da421 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 
 blank_issues_enabled: false
 contact_links:
-  - name: Ask a question
+  - name: "🤔 Ask a question"
     url: https://https://github.com/umami-software/umami/discussions
     about: Ask questions and discuss with other community members
\ No newline at end of file