diff --git a/.github/ISSUE_TEMPLATE/wiki issue.md b/.github/ISSUE_TEMPLATE/wiki issue.md
deleted file mode 100644
index 4dc8c0ca..00000000
--- a/.github/ISSUE_TEMPLATE/wiki issue.md	
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Wiki issue
-about: Report a wiki issue
-title: 'Wiki issue: '
-labels: "📄 Wiki issue"
-
----
-
-Link to problematic page in Wiki:
-
-What's the issue?
diff --git a/.github/ISSUE_TEMPLATE/wiki issue.yml b/.github/ISSUE_TEMPLATE/wiki issue.yml
new file mode 100644
index 00000000..d6f8cb57
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/wiki issue.yml	
@@ -0,0 +1,18 @@
+name: Wiki issue
+description: Report a Wiki issue
+title: "Wiki issue: "
+labels: ["📄 Wiki issue"]
+body:
+  - type: input
+    id: url
+    attributes:
+      label: "URL to the Wiki page"
+      placeholder: "https://github.com/qdm12/gluetun/wiki/OpenVPN-options"
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: "What's the issue?"
+    validations:
+      required: true