diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..3ba13e0cec6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE/issue-report.md
similarity index 94%
rename from .github/issue_template.md
rename to .github/ISSUE_TEMPLATE/issue-report.md
index 2da326fd5cd..6166d9fdcdf 100644
--- a/.github/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue-report.md
@@ -1,48 +1,57 @@
-<!-- 
-PLEASE READ THIS CAREFULLY:
-
-1. You *MUST* read and complete the steps from the checklist below, by placing
-   an x into each [ ] (so that it shows '[x]', NOT '[ x]' or '[x ]'), BEFORE
-   clicking on 'Submit new issue'.
-
-2. Failure to perform these steps, WHICH ARE ONLY THERE TO HELP *YOU*, will
-   usually result in your issue being dismissed without notice.
-
-3. If you are reporting an issue when trying to run Rufus, or when trying to
-   boot a media created by Rufus, you *MUST* provide a log, period. Please do
-   not assume that the developer(s) will be able to "guess" the specifics of
-   your environment, what image you used, what type of media you used it with
-   or the many many other critical parameters that the log provides data for.
-   To investigate an issue, a log from Rufus is ALWAYS required.
-
-4. If you still *choose* not to provide a log when reporting a problem, you
-   agree that your issue will be closed without any further investigation.
-
-YOU HAVE BEEN WARNED.
--->
-
-Checklist
----------
-- [ ] I have been made aware that if my problem can be summarized as _"I've created or tried to create a media using Rufus, and ..."_, and I am not including a log, **this issue will be summarily closed**.
-- [ ] I looked at https://github.com/pbatard/rufus/wiki/FAQ to see if my question has already been answered.
-- [ ] I performed a search in the issue tracker for similar issues using keywords relevant to my problem, such as the error message I got from the log.
-- [ ] I clicked the 'Log' button (🗒️) or pressed <kbd>Ctrl</kbd>-<kbd>L</kbd> in Rufus, or used [DebugView](https://learn.microsoft.com/en-us/sysinternals/downloads/debugview), and copy/pasted the log into the section that says `<FULL LOG>` below.
-- [ ] The log I am copying is the FULL log, starting with the line `Rufus version: x.y.z` - I have NOT removed any part of it.
-
-Additionally (if applicable):
-- [ ] I ran a bad blocks check, by clicking _Show advanced format options_ then _Check device for bad blocks_, and confirmed that my USB is not defective.
-- [ ] I also tried one or more of the following:
-  - [ ] Using a different USB drive.
-  - [ ] Plugging the USB into a different port.
-  - [ ] Running Rufus on a different computer.
-- [ ] If using an image, I clicked on the `(✓)` button to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image.
-
-Issue description
------------------
-<Please describe your issue here>
-
-Log
----
-```
-<FULL LOG>
-```
+---
+name: Report an issue with the application
+about: Please make sure you follow the check-list carefully!
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+PLEASE READ THIS CAREFULLY:
+
+1. You *MUST* read and complete the steps from the checklist below, by placing
+   an x into each [ ] (so that it shows '[x]', NOT '[ x]' or '[x ]'), BEFORE
+   clicking on 'Submit new issue'.
+
+2. Failure to perform these steps, WHICH ARE ONLY THERE TO HELP *YOU*, will
+   usually result in your issue being dismissed without notice.
+
+3. If you are reporting an issue when trying to run Rufus, or when trying to
+   boot a media created by Rufus, you *MUST* provide a log, period. Please do
+   not assume that the developer(s) will be able to "guess" the specifics of
+   your environment, what image you used, what type of media you used it with
+   or the many many other critical parameters that the log provides data for.
+   To investigate an issue, a log from Rufus is ALWAYS required.
+
+4. If you still *choose* not to provide a log when reporting a problem, you
+   agree that your issue will be closed without any further investigation.
+
+YOU HAVE BEEN WARNED.
+-->
+
+Checklist
+---------
+- [ ] I have been made aware that if my problem can be summarized as _"I've created or tried to create a media using Rufus, and ..."_, and I am not including a log, **this issue will be summarily closed**.
+- [ ] I looked at https://github.com/pbatard/rufus/wiki/FAQ to see if my question has already been answered.
+- [ ] I performed a search in the issue tracker for similar issues using keywords relevant to my problem, such as the error message I got from the log.
+- [ ] I clicked the 'Log' button (🗒️) or pressed <kbd>Ctrl</kbd>-<kbd>L</kbd> in Rufus, or used [DebugView](https://learn.microsoft.com/en-us/sysinternals/downloads/debugview), and copy/pasted the log into the section that says `<FULL LOG>` below.
+- [ ] The log I am copying is the FULL log, starting with the line `Rufus version: x.y.z` - I have NOT removed any part of it.
+
+Additionally (if applicable):
+- [ ] I ran a bad blocks check, by clicking _Show advanced format options_ then _Check device for bad blocks_, and confirmed that my USB is not defective.
+- [ ] I also tried one or more of the following:
+  - [ ] Using a different USB drive.
+  - [ ] Plugging the USB into a different port.
+  - [ ] Running Rufus on a different computer.
+- [ ] If using an image, I clicked on the `(✓)` button to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image.
+
+Issue description
+-----------------
+<Please describe your issue here>
+
+Log
+---
+```
+<FULL LOG>
+```
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 040896d59b5..fdb0763e490 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [master]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/**'
       - '.gitignore'
       - '.gitattributes'
       - 'res/**'
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 98bcca8d6e5..da40284ea6f 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [master]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/**'
       - '.gitignore'
       - '.gitattributes'
       - 'res/**'
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index c56eacc691c..b62435b56ac 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -3,6 +3,7 @@ name: MinGW
 on: 
   push:
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/**'
       - '.gitignore'
       - '.gitattributes'
       - 'res/**'
diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml
index 457b2f586c7..963477fecc9 100644
--- a/.github/workflows/vs2022.yml
+++ b/.github/workflows/vs2022.yml
@@ -3,6 +3,7 @@ name: VS2022
 on: 
   push:
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/**'
       - '.gitignore'
       - '.gitattributes'
       - 'res/**'
diff --git a/SECURITY.md b/SECURITY.md
index b2dc36bfb27..55b8812f3ee 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,7 +1,9 @@
-# Reporting a Vulnerability
+# Reporting a security vulnerability
 
-To report a vulnerability for Rufus, please e-mail support@akeo.ie.
+To report a **security** vulnerability for Rufus (i.e. an issue that you believe could lead to malicious actors being able to exploit the Rufus application), please e-mail support@akeo.ie.
 
-If you find a vulnerability, we will ask you to respect [responsible disclosure](https://en.wikipedia.org/wiki/Responsible_disclosure) practices.
+Please do **NOT** use the e-mail above if you have a regular issue, such as a problem creating or using a bootable drive. Instead go back to https://github.com/pbatard/rufus/issues and create an issue using the regular *Issue Report* template.
 
-In return, we will endeavour to respond to vulnerability reports within 48 hours.
+For any security vulnerability report, we kindly ask you to respect [responsible disclosure](https://en.wikipedia.org/wiki/Responsible_disclosure) practices.
+
+In return, we will endeavour to respond to security vulnerability reports within 48 hours.
diff --git a/src/rufus.rc b/src/rufus.rc
index 68eecb10df4..c40170abc0d 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 4.7.2217"
+CAPTION "Rufus 4.7.2218"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -399,8 +399,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,7,2217,0
- PRODUCTVERSION 4,7,2217,0
+ FILEVERSION 4,7,2218,0
+ PRODUCTVERSION 4,7,2218,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -418,13 +418,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.7.2217"
+            VALUE "FileVersion", "4.7.2218"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2025 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.7.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.7.2217"
+            VALUE "ProductVersion", "4.7.2218"
         END
     END
     BLOCK "VarFileInfo"