diff --git a/.github/ISSUE_TEMPLATE/01_report_issue.yml b/.github/ISSUE_TEMPLATE/01_report_issue.yml
new file mode 100644
index 0000000000..0c70d751fc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01_report_issue.yml
@@ -0,0 +1,41 @@
+name: Report an issue
+description: For issues that are not related to any other issue form.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out an issue. This template is intended for any issues that do not fit other issue templates.
+        For feedback or help running Space Station 14, please join our [Discord](https://discord.gg/rGvu9hKffJ).
+  - type: input
+    attributes:
+      label: What version did the issue occur in?
+      description: You can find the version by opening the changelog in-game and looking at the bottom right corner of the changelog window.
+      placeholder: wizards/aa1337b
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of what the issue is.
+        If the issue is visual in nature, consider posting a screenshot.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reproduction
+      description: List the steps required to reproduce the issue.
+      placeholder: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other additional context about the issue here.
+    validations:
+      required: false
+
diff --git a/.github/ISSUE_TEMPLATE/02_mapping_issue.yml b/.github/ISSUE_TEMPLATE/02_mapping_issue.yml
new file mode 100644
index 0000000000..36fe96c914
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_mapping_issue.yml
@@ -0,0 +1,48 @@
+name: Report an mapping issue
+description: For issues regarding mapping.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out an issue. This template is intended for any issues related to mapping.
+        For feedback or help running Space Station 14, please join our [Discord](https://discord.gg/rGvu9hKffJ).
+  - type: input
+    attributes:
+      label: What version did the issue occur in?
+      description: You can find the version by opening the changelog in-game and looking at the bottom right corner of the changelog window.
+      placeholder: wizards/aa1337b
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: On what station, shuttle, or grid did the issue occur on?
+      description: The name of the station, shuttle, or grid. If you do not know the name, try to describe it.
+      placeholder: Bagel
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of what the issue is.
+        If the issue is visual in nature, consider posting a screenshot.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reproduction
+      description: List the steps required to reproduce the issue.
+      placeholder: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other additional context about the issue here.
+    validations:
+      required: false
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 09c9e76b19..501625bd2f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,5 @@
+blank_issues_enabled: true
 contact_links:
-  - name: Report a Security Vulnerability
-    url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
-    about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
   - name: Request a Feature
     url: https://discord.gg/rGvu9hKffJ
     about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
deleted file mode 100644
index 9bc805b74e..0000000000
--- a/.github/ISSUE_TEMPLATE/issue_report.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Report an Issue
-about: "..."
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Description
-<!-- Explain your issue in detail. Issues without proper explanation are liable to be closed by maintainers. -->
-
-**Reproduction**
-<!-- Include the steps to reproduce if applicable. -->
-
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Additional context**
-<!-- Add any other context about the problem here. Anything you think is related to the issue. -->
diff --git a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md b/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
deleted file mode 100644
index dae84c3e25..0000000000
--- a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Toolshed feature request
-about: Suggest a feature for Toolshed (for game admins/developers)
-title: "[TOOLSHED REQUEST]"
-labels: Toolshed
-assignees: moonheart08
-
----
-
-**Is your feature request related to a problem/bug? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the command you'd like**
-A clear and concise description of what you want and what it should do.
-If you're a technical user (i.e. programmer) including type signatures is helpful.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.