diff --git a/.github/ISSUE_TEMPLATE/cli-application.md b/.github/ISSUE_TEMPLATE/cli-application.md
new file mode 100644
index 00000000..68f35b74
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cli-application.md
@@ -0,0 +1,35 @@
+---
+name: CLI Application
+about: Report an issue with the pgpainless-cli utility
+title: ''
+labels: 'module: cli'
+assignees: ''
+
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**Version**
+<!-- What version of the software are you using? -->
+- `pgpainless-cli`:
+
+**Installation Source**
+<!-- Where did you install / build pgpainless-cli from? -->
+- Debian Repository
+- Built locally (`gradle build...`)
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior: -->
+1. `pgpainless-cli foo bar [...]`'
+2. ...
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+<!-- Add any other context (test keys, test messages) about the problem here. -->
+```
+-----BEGIN PGP FOO BAR-----
+...
+```
diff --git a/.github/ISSUE_TEMPLATE/library.md b/.github/ISSUE_TEMPLATE/library.md
new file mode 100644
index 00000000..74f5f666
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/library.md
@@ -0,0 +1,28 @@
+---
+name: Library
+about: Report an issue with the libraries pgpainless-core or pgpainless-sop
+title: ''
+labels: 'module: core'
+assignees: ''
+
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**Version**
+<!-- What version of the software are you using? Delete lines which are not applicable. -->
+- `pgpainless-core`:
+- `pgpainless-sop`:
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior: -->
+```
+Example Code Block with your Code
+```
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+<!-- Add any other context about the problem here. -->