diff --git a/.github/ISSUE_TEMPLATE/build.yml b/.github/ISSUE_TEMPLATE/build.yml
new file mode 100644
index 0000000..0787047
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/build.yml
@@ -0,0 +1,21 @@
+name: "CI/CD"
+description: Any changes/issues for the build process
+labels: ["chore"]
+assignees:
+  - nopenothinghere
+body:
+
+  - type: markdown
+    attributes:
+      value: |
+        Briefly describe the issue or change.
+        Note: you can also open a [discussion](https://github.com/Anon-Planet/thgtoa/discussions/new/choose).
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Short description
+      description: Please describe what should be fixed/changed.
+      placeholder: Makefile doesn't build [document.md]. Here's how it can be fixed.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index 719ffc8..0000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Suggestion
-about: Suggest something for the guide
-title: ""
-labels: "T: doc"
-assignees: ""
----
-
-**Please describe the scope.**
-
-<!-- A clear and concise description of what the problem is,
-e.g. something that is outdated or needs additional info. 
-Limit this to about 60-70 chars. -->
-
-**Please describe the solution.**
-
-<!-- A clear and concise description of what you want to happen 
-or see changed. You're welcome to ask for changes regarding 
-anything as long as it is in scope. -->
-
-**Please describe alternatives.**
-
-<!-- A clear and concise description of any alternative solutions 
-or features you've considered. e.g. "This could instead be 
-replaced by <some other program> or <other link>." Make sure it's 
-in scope. -->
-
-**Give any additional relevant context.**
-
-<!-- Add any other links and related imagery or data here. We 
-will not entertain any sort of suggestion that doesn't fit in the
-threat model described in the guide. It is aimed at protecting 
-journalists, whistleblowers and activists, and any suggestion will
-require research on the behalf of the person writing the issue. -->
diff --git a/.github/ISSUE_TEMPLATE/donation.yml b/.github/ISSUE_TEMPLATE/donation.yml
new file mode 100644
index 0000000..29f763f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/donation.yml
@@ -0,0 +1,12 @@
+name: "Donation"
+description: Donation transparency report
+labels: ["donation"]
+body:
+
+  - type: input
+    attributes:
+      label: Donation
+      description: An [anonymous] donation was made [by whom]
+      placeholder: "0.1 XXX was donated [from whom]"
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml
new file mode 100644
index 0000000..ed19d10
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/suggestion.yml
@@ -0,0 +1,46 @@
+name: "Content Suggestion"
+description: Suggest something for the guide
+labels: ["next"]
+body:
+
+  - type: markdown
+    attributes:
+      value: |
+        Briefly describe your suggestion.
+        Note: you can also open a [discussion](https://github.com/Anon-Planet/thgtoa/discussions/new/choose).
+
+  - type: input
+    attributes:
+      label: Affected section of the guide
+      description: Please let us know which part of the guide is affected.
+      placeholder: "https://anonymousplanet.org/guide.html#persistent-plausible-deniability-using-whonix-within-tails"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Short description
+      description: Please let us know what should be fixed/changed.
+      placeholder: There is a typo in this line or mistake in this logic.
+    validations:
+      required: true
+
+  - type: textarea
+    id: source
+    attributes:
+      label: Research
+      description: Please do your own due diligence when suggesting changes.
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Required checks
+      description: You are required to check that you have read the CoC.
+      options:
+        - label: This is not an opinion. It is fact. It is backed by [my own] research.
+          required: true
+        - label: I agree to the [PSA Code of Conduct](https://anonymousplanet.org/export/CODE_OF_CONDUCT.html).
+          required: true