diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index eb6dde6c..0d8637d4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,23 +9,25 @@ Thank you for sending a bug report! Here are some tips:
 2. If you are not sure if it is a bug or not, you can ask in the Kubernetes slack channel `#dexidp`.
 -->
 
-**Expected behavior (what you expected to happen)**:
+#### Expected behavior (what you expected to happen)
 
-**Actual behavior (what actually happened)**:
+#### Actual behavior (what actually happened)
+
+#### Steps to reproduce
 
-**Steps to reproduce**:
 1. ...
 2. ...
 3. ...
 
-**Environment**:
+#### Environment
+
 - Dex version:
 - Storage type:
 - Installation type (official docker image, helm chart, etc.):
 
-**Anything else we should know?**:
+#### Anything else we should know?
 
-**Additional information for debugging (if necessary)**:
+#### Additional information for debugging (if necessary)
 
 <details><summary>Configuration</summary><br><pre>
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index bd436cfd..f2f370d0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,9 @@
 blank_issues_enabled: false
 contact_links:
+  - name: ❓ Ask a question
+    url: https://github.com/dexidp/dex/discussions/new
+    about:  Ask and discuss questions with other Dex community members
+
   - name: 📚 Documentation
     url: https://dexidp.io/docs/
     about: Check the documentation for help
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 38201bb4..c8f46454 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ about: Suggest an idea for Dex
  Please describe what you would like to change/add and why in detail by filling out the template below.
  -->
 
-**Is your feature request related to a problem? Please describe.**
+#### Is your feature request related to a problem?
 <!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
-**Describe the solution you'd like to see**
+#### Describe the solution you'd like to see
 <!-- A clear and concise description of what would you like to happen. -->
 
-**Describe alternatives you've considered**
+#### Describe alternatives you've considered
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
-**Additional context**
+#### Additional context
 <!-- Add any other context or screenshots about the feature request here. -->
diff --git a/MAINTAINERS b/MAINTAINERS
index 2c0e48cb..3e3ae80b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,5 @@
 Joel Speed <Joel.speed@hotmail.co.uk> (@JoelSpeed)
-Mark Sagi-Kazar <mark@banzaicloud.com> (@sagikazarmark)
+Mark Sagi-Kazar <mark.sagikazar@gmail.com> (@sagikazarmark)
 Nandor Kracser <nandor@banzaicloud.com> (@bonifaido)
 Rithu John <rithujohn191@gmail.com> (@rithujohn191)
 Stephen Augustus <stephen@agst.us> (@justaugustus)