diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index e84e6a63c..190104a47 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,24 +5,12 @@ labels: type:bug
 ---
 
 <!--
-**************************************
-    ⚠️⚠️⚠️ READ CAREFULLY ⚠️⚠️⚠️
-**************************************
-
-Do you want to ask a QUESTION? Are you looking for SUPPORT?
-We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
-
-By filing an issue, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
-
-Of course, we also expect you to search for existing similar issues first! ;) https://github.com/cryptomator/cryptomator/issues?q=
+Please make sure to:
+- Comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
+- Search for existing similar issues first: https://github.com/cryptomator/cryptomator/issues?q=
 
 ⚠️ IMPORTANT: If you don't stick to this template, the issue will get closed.
-
-*****************************************************************************
-    To proof that you read this, please remove the X from the line below:
-*****************************************************************************
 -->
-<!-- oooXooo -->
 
 ### Description
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index fd88223e4..94f5f512b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Cryptomator Community
+  - name: Help & Support
     url: https://community.cryptomator.org/
-    about: Please ask and answer questions here
-  - name: Documentation
+    about: You will find answers in our community forum
+  - name: User Manual
     url: https://docs.cryptomator.org/
-    about: Get instructions on how to use Cryptomator
+    about: Read the Cryptomator documentation here
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 513937e58..366f7ecca 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -5,14 +5,9 @@ labels: type:feature-request
 ---
 
 <!--
-
-Do you want to ask a QUESTION? Are you looking for SUPPORT?
-We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
-
-By filing a feature request, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
-
-Of course, we also expect you to search for existing similar issues first! ;) https://github.com/cryptomator/cryptomator/issues?q=
-
+Please make sure to:
+- Comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
+- Search for existing similar issues first: https://github.com/cryptomator/cryptomator/issues?q=
 -->
 
 ### Summary
diff --git a/SECURITY.md b/.github/SECURITY.md
similarity index 100%
rename from SECURITY.md
rename to .github/SECURITY.md
diff --git a/SUPPORT.md b/.github/SUPPORT.md
similarity index 100%
rename from SUPPORT.md
rename to .github/SUPPORT.md
diff --git a/.github/workflows/triageBugs.yml b/.github/workflows/triageBugs.yml
index f3354fb11..bcb0695b0 100644
--- a/.github/workflows/triageBugs.yml
+++ b/.github/workflows/triageBugs.yml
@@ -6,20 +6,32 @@ on:
 
 jobs:
   closeTemplateViolation:
-    name: Close bug reports that violate the issue template
+    name: Validate bug report against issue template
     runs-on: ubuntu-latest
+    if: contains(github.event.issue.labels.*.name, 'type:bug')
     steps:
-      - if: |
-          contains(github.event.issue.labels.*.name, 'type:bug')
-          && (
-            !contains(github.event.issue.body, '<!-- oooooo -->')
-            || !contains(github.event.issue.body, '### Description')
-          )
-        name: Close Issue
+      - name: Check "Description"
+        if: |
+          !contains(github.event.issue.body, env.MUST_CONTAIN)
+          || contains(toJson(github.event.issue.body), env.MUST_NOT_CONTAIN)
+        run: exit 1
+        env:
+          MUST_CONTAIN: '### Description'
+          MUST_NOT_CONTAIN: '### Description\r\n\r\n[Summarize your problem.]\r\n\r\n### System Setup'
+      - name: Check "Steps to Reproduce"
+        if: |
+          !contains(github.event.issue.body, env.MUST_CONTAIN)
+          || contains(toJson(github.event.issue.body), env.MUST_NOT_CONTAIN)
+        run: exit 1
+        env:
+          MUST_CONTAIN: '### Steps to Reproduce'
+          MUST_NOT_CONTAIN: '### Steps to Reproduce\r\n\r\n1. [First step]\r\n2. [Second step]\r\n3. [and so on…]\r\n\r\n#### Expected Behavior'
+      - name: Close issue if one of the checks failed
+        if: ${{ failure() }}
         uses: peter-evans/close-issue@v1
         with:
           comment: |
             This bug report did ignore our issue template. 😞
             Auto-closing this issue, since it is most likely not useful.
 
-            _This decision was made by a bot. If you think the bot is wrong, let us know and we'll reopen this issue._
\ No newline at end of file
+            _This decision was made by a bot. If you think the bot is wrong, let us know and we'll reopen this issue._