diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index cbc46ed..d2765f5 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,30 @@
-Please use one of the following templates:
+<!--
+Thanks for taking the time to draft up an issue for Axon Framework's Kotlin Extension!
+Prior to starting off, please read the following:
 
-https://github.com/AxonFramework/extension-kotlin/issues/new/choose
+## Usage Questions
+
+If you are having difficulty using Axon Framework's Kotlin Extension,
+ please consider to check Axon's Reference Guide first if it answers your question: https://docs.axoniq.io/reference-guide/extensions/kotlin
+ 
+When the Reference Guide does no cover the specific question you have, take the following into account:
+- GitHub is *not* intended for usages questions, instead:
+- Drop a questions on AxonIQ's forum: https://discuss.axoniq.io/
+- Or place a new question on StackOverflow, using the `axon` tag.
+
+## Reporting an bug, feature or enhancement
+
+Prior to filing an issue, please verify that it's not already reported by someone else.
+After that's done, your issue will typically fall under one of the following options:
+
+1. It's a `bug`
+2. It's a `feature` request
+3. It's an `enhancement` request
+
+It is recommended that for either of the three you use one of the prepared issue template.
+You can find all three of them [here](https://github.com/AxonFramework/extension-kotlin/issues/new/choose). 
+
+## None of the above fit!
+
+If you have encountered a use case which is not a question, nor a feature request, feel free to draft your scenario below.
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.md b/.github/ISSUE_TEMPLATE/1_bug_report.md
deleted file mode 100644
index a74e369..0000000
--- a/.github/ISSUE_TEMPLATE/1_bug_report.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: 'Bug report'
-about: 'Report a bug in Axon Framework - Extension Kotlin'
-title:
-labels: 'type: bug :bug:'
-assignees: 
-
----
-
-### Steps to reproduce
-
-* extension-kotlin version:
-* Axon Framework version:
-* JDK version:  
-* Complete executable reproducer: (e.g. GitHub Repo)
-* Steps: (what exactly are you doing with the above reproducer?)
-
-### Expected behaviour
-
-### Actual behaviour
-
-(In case of exceptions please provide full stack trace)
diff --git a/.github/ISSUE_TEMPLATE/1_feature_request.md b/.github/ISSUE_TEMPLATE/1_feature_request.md
new file mode 100644
index 0000000..3ada36d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_feature_request.md
@@ -0,0 +1,24 @@
+---
+name: 'Enhancement request'
+about: 'Suggest an enhancement/change to an existing feature for the Kotlin Extension'
+title:
+labels: 'Type: Enhancement'
+---
+
+<!-- Please use markdown (https://guides.github.com/features/mastering-markdown/) semantics throughout the enhancement description. -->
+
+### Enhancement Description
+
+<!-- Please provide a description of the feature you envision. -->
+
+### Current Behaviour
+
+<!-- Please share the current behaviour of the Kotlin Extension around this topic, if applicable. -->
+
+### Wanted Behaviour
+
+<!-- Please described the desired outcome through the Kotlin Extension around the suggested enhancement. -->
+
+### Possible Workarounds
+
+<!-- If applicable, share any workarounds for the described enhancement. -->
diff --git a/.github/ISSUE_TEMPLATE/3_enhancement_request.md b/.github/ISSUE_TEMPLATE/2_enhancement_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/3_enhancement_request.md
rename to .github/ISSUE_TEMPLATE/2_enhancement_request.md
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
deleted file mode 100644
index 65c902d..0000000
--- a/.github/ISSUE_TEMPLATE/2_feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: 'Feature request'
-about: 'Suggest a feature for Axon Framework - Extension Kotlin'
-title:
-labels: 'type: feature'
-
----
-
-### Scenario
-
-* extension-kotlin version:
-* Axon Framework version:
-* Description of your use case: (detailed description or executable reproducer, e.g. GitHub repo)
-
-### Current Behaviour
-
-### Wanted Behaviour
-
-### Possible Workarounds
diff --git a/.github/ISSUE_TEMPLATE/3_bug_report.md b/.github/ISSUE_TEMPLATE/3_bug_report.md
new file mode 100644
index 0000000..d95e44b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_bug_report.md
@@ -0,0 +1,33 @@
+---
+name: 'Bug report'
+about: 'Report a bug for the Kotlin Extension'
+title:
+labels: 'Type: Bug'
+---
+
+<!-- Please use markdown (https://guides.github.com/features/mastering-markdown/) semantics throughout the bug description. -->
+
+### Basic information
+
+* Axon Framework version:
+* JDK version:  
+* Kotlin Extension version:
+* Complete executable reproducer if available (e.g. GitHub Repo):
+
+### Steps to reproduce
+
+<!-- 
+    Share all steps to be able to reproduce the bug, ideally based on a reproducer.
+    Combining this with a description of your setup helps us to figure out what the issue might be. 
+-->
+
+### Expected behaviour
+
+<!-- Please describe the expected behaviour. -->
+
+### Actual behaviour
+
+<!-- 
+    Please describe the actual behaviour as discovered.
+    If available, provide the entire stack trace, with markdown (```) semantics. 
+-->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index de418ec..455ccd9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,3 +13,4 @@ updates:
   reviewers:
     - "sandjelkovic"
     - "smcvb"
+  milestone: 2
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 016f2f4..f44446f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
     <junit.jupiter.version>5.7.0</junit.jupiter.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>2.13.3</log4j.version>
-    <dokka.version>1.4.10</dokka.version>
     <springboot.version>2.3.2.RELEASE</springboot.version>
+    <dokka.version>1.4.10.2</dokka.version>
   </properties>
 
   <dependencyManagement>