diff --git a/.github/ISSUE_TEMPLATE/Security_issue.md b/.github/ISSUE_TEMPLATE/Security_issue.md
deleted file mode 100644
index 8e5c8865a..000000000
--- a/.github/ISSUE_TEMPLATE/Security_issue.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Security issue
-about: Report security issue affecting this project
-labels: security
-assignees: tomkerkhove
----
-
-A clear and concise description of how the security issue affects this project
-
-Things to consider
- * Severity?
- * Is in production?
- * Affected components?
-
-## Vulnerability Information
-Link to National Vulnurability Database or similar (CVE-2018-14041)[https://nvd.nist.gov/vuln/detail/CVE-2018-14041]
-
-## Steps to reproduce
-Not always applicable
- 1. Step 1
- 2. Step 2
- 3. Step ...
-
-## Vulnerability Migitation
-Migitation options, if there are any
-
-## Vulnerability Fix
-Options for fixing the vulnerability
-
-## Application Specifications
-
-- Docker Image Version:
-- Platform(s):
-- Subsystem(s):
diff --git a/.github/ISSUE_TEMPLATE/security_issue.yml b/.github/ISSUE_TEMPLATE/security_issue.yml
new file mode 100644
index 000000000..0f99085fc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security_issue.yml
@@ -0,0 +1,45 @@
+name: Security Report 🔐
+about: Report security vulnerability impacting users
+labels: security
+assignees: tomkerkhove
+issue_body: true
+inputs:
+- type: textarea
+  attributes:
+    label: Report
+    description: "What is the vulnerability and how does it affect Promitor?
+    placeholder: "A clear and concise description of how the security issue affects this project"
+- type: input
+  attributes:
+    label: Vulnerability Information
+    description: Are there official sources listing the vulnerability? For example, the National Vulnurability Database or similar.
+    required: false
+- type: multi_select
+  attributes:
+    label: Affected Component(s)
+    description: What Promitor components are impacted?
+    required: true
+    choices:
+    - Resource Discovery
+    - Scraper
+- type: input
+  attributes:
+    label: Affected Version(s)
+    description: What version(s) are impacted?
+    required: true
+- type: textarea
+  attributes:
+    label: Vulnerability Migitation
+    description: "What are the options to mitigate the vulnerability?"
+    required: false
+- type: textarea
+  attributes:
+    label: Vulnerability Fix
+    description: "What are the options to patch the vulnerability?"
+    required: false
+- type: input
+  attributes:
+    label: Contact Details
+    description: How can we get in touch with you if we need more info?
+    required: false
+    placeholder: ex. email@example.com