diff --git a/.github/ISSUE_TEMPLATE/01-bug.yml b/.github/ISSUE_TEMPLATE/01-bug.yml
new file mode 100644
index 0000000000..63b0634e6f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01-bug.yml
@@ -0,0 +1,82 @@
+name: Bug Report
+description: Create a bug report to help us improve
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug Description
+      description: A clear and concise description of what the bug is
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: '## Environment'
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      placeholder: ex. Ubuntu Linux 22.04
+    validations:
+      required: true
+  - type: input
+    id: n8n-version
+    attributes:
+      label: n8n Version
+      placeholder: ex. 1.25.0
+    validations:
+      required: true
+  - type: input
+    id: nodejs-version
+    attributes:
+      label: Node.js Version
+      placeholder: ex. 18.16.0
+    validations:
+      required: true
+  - type: dropdown
+    id: db
+    attributes:
+      label: Database
+      options:
+        - SQLite (default)
+        - PostgreSQL
+        - MySQL
+        - MariaDB
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: execution-mode
+    attributes:
+      label: Execution mode
+      description: '[Info](https://docs.n8n.io/hosting/scaling/execution-modes-processes/)'
+      options:
+        - main (default)
+        - queue
+        - own (deprecated)
+      default: 0
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 91b6a5669c..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
----
-
-**Describe the bug**
-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
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Environment (please complete the following information):**
-
-- OS: [e.g. Ubuntu Linux 22.04]
-- n8n Version [e.g. 1.0.1]
-- Node.js Version [e.g. 18.16.0]
-- Database system [e.g. SQLite; n8n uses SQLite as default otherwise changed]
-- Operation mode [e.g. own; operation modes are `own`, `main` and `queue`. Default is `main`]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c2caf18ab3..8b62ca7bbb 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -6,3 +6,6 @@ contact_links:
   - name: Question / Problem
     url: https://community.n8n.io
     about: Questions and problems with n8n
+  - name: n8n Security Vulnerability
+    url: https://n8n.io/legal/#vulnerability
+    about: Learn about our Vulnerability Disclosure Policy
diff --git a/.github/workflows/check-issue-template.yml b/.github/workflows/check-issue-template.yml
deleted file mode 100644
index 7eeff27a37..0000000000
--- a/.github/workflows/check-issue-template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Check Issue Template
-
-on:
-  issues:
-    types: [opened, edited]
-
-jobs:
-  check-issue:
-    name: Check Issue Template
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Check Issue Template
-        uses: n8n-io/validate-issue-template-content@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}