diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 17f3cb9..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for bugs)
-
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-
-1.  <!--- Step 1 --->
-2.  <!--- Step 2 --->
-3.  <!--- Step 3 --->
-4.  <!--- Step 4 --->
-
-## Context
-
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-
-- Version used:
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..2ee416f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,72 @@
+name: Bug report
+description: Bug descriptions or unexpected behaviour
+title: "[Bug]: <Short description>"
+labels: ["bug","help wanted"]
+body:
+  - type: input
+    attributes:
+      label: OAuth2-Proxy Version
+      description: Which version of oauth2-proxy are you using?
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Provider
+      description: Which identity provider are you using?
+      options:
+        - adfs
+        - azure
+        - bitbucket
+        - digitalocean
+        - facebook
+        - gitea
+        - github
+        - gitlab
+        - google
+        - keycloak
+        - keycloak-oidc
+        - linkedin
+        - logingov
+        - nextcloud
+        - oidc
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Expected Behaviour
+      description: Tell us what you expect to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behaviour
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        1. With this config...
+        1. Run '...'
+        1. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible Solutions
+      description: Not obligatory, but suggest a fix/reason for the bug.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Configuration details or additional information
+      description: |
+        Please share more details about your environment and how you configured oauth2-proxy.
+      
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..f718420
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: OAuth2-Proxy Slack
+    url: https://gophers.slack.com/messages/CM2RSS25N
+    about: Feel free to ask any questions here.
+
diff --git a/.github/ISSUE_TEMPLATE/configuration-support.yml b/.github/ISSUE_TEMPLATE/configuration-support.yml
new file mode 100644
index 0000000..b567cc5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/configuration-support.yml
@@ -0,0 +1,60 @@
+name: Configuration support
+description: Configuration problems and overall requests on how to properly use oauth2-proxy.
+title: "[Support]: <Short description>"
+labels: ["configuration", "help wanted"]
+body:
+  - type: input
+    attributes:
+      label: OAuth2-Proxy Version
+      description: Which version of oauth2-proxy are you using?
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Provider
+      description: Which identity provider are you using?
+      options:
+        - adfs
+        - azure
+        - bitbucket
+        - digitalocean
+        - facebook
+        - gitea
+        - github
+        - gitlab
+        - google
+        - keycloak
+        - keycloak-oidc
+        - linkedin
+        - logingov
+        - nextcloud
+        - oidc
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behaviour of your Problem
+      description: Tell us what you expect to happen and what happens instead.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Configuration details or additional information
+      description: |
+        Please share more details about your environment and how you configured oauth2-proxy.
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        1. With this config...
+        1. Run '...'
+        1. See error...
+    validations:
+      required: false
+
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..0f08901
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,50 @@
+name: Feature request
+description: Feature requests or proposals related to the overall project or specific providers
+title: "[Feature]: <Short description>"
+labels: ["enhancement"]
+body:
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Tell us the motivation behind your feature request or proposal.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible solution
+      description: |
+        If you already have a possible solution in mind. Write some more details about it or add some pseudo code.
+
+        Tip 1: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+        Tip 2: You can add code snippets in triple backtiks like so:
+               \`\`\`golang
+               func hello() {
+                 fmt.Println("world")
+               }
+               \`\`\`
+    validations:
+      required: false
+  - type: dropdown
+    attributes:
+      label: Provider
+      description: Is it a feature request for a specific provider. Not mandatory.
+      options:
+        - new provider
+        - adfs
+        - azure
+        - bitbucket
+        - digitalocean
+        - facebook
+        - gitea
+        - github
+        - gitlab
+        - google
+        - keycloak
+        - keycloak-oidc
+        - linkedin
+        - logingov
+        - nextcloud
+        - oidc
+    validations:
+      required: false
+