diff --git a/.github/ISSUE_TEMPLATE/9-anything-else.md b/.github/ISSUE_TEMPLATE/9-anything-else.md
new file mode 100644
index 0000000..0728e87
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/9-anything-else.md
@@ -0,0 +1,20 @@
+---
+name: Anything else
+about: If your issue isn't any of the other types above
+title: ''
+labels: question
+assignees: ''
+
+---
+
+**Describe your issue**
+A clear and concise description of what the issue is.
+
+**Version**
+- Home Assistant version: [e.g. 2026.4.1]
+- Home Assistant install method: [e.g. Container or HA OS]
+- Integration version: [e.g. 1.0.2]
+- If applicable for a frontend bug, browser (type and version): [e.g. Chrome 102]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..74a1bb0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Something is going wrong (or not matching expected behavior)
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version**
+- Home Assistant version: [e.g. 2026.4.1]
+- Home Assistant install method: [e.g. Container or HA OS]
+- Integration version: [e.g. 1.0.2]
+- If applicable for a frontend bug, browser (type and version): [e.g. Chrome 102]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..ad99144
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature Request
+    url: https://github.com/christiaangoossens/hass-oidc-auth/discussions/categories/ideas
+    about: Feature Requests are submitted over at the Discussions Ideas section
+  - name: Question
+    url: https://github.com/christiaangoossens/hass-oidc-auth/discussions/categories/q-a
+    about: Questions (usage instructions/did I configure it correctly) are answered over at the Discussions Q&A section
+  - name: Security Issue/Vulnerability
+    url: https://github.com/christiaangoossens/hass-oidc-auth/security/advisories/new
+    about: Security Vulnerabilities should be reported using the Security Advisories system