diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f64f474..d83ac5d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,6 +3,9 @@ contact_links:
   - name: Ask on Gitter
     url: https://gitter.im/nektos/act
     about: You can ask for help here!
+  - name: Ask on Gitter (via Matrix)
+    url: https://matrix.to/#/#nektos_act:gitter.im?via=gitter.im&via=matrix.org
+    about: If you prefer Matrix over Gitter
   - name: Want to contribute to act?
     url: https://github.com/nektos/act/blob/master/CONTRIBUTING.md
     about: Be sure to read contributing guidelines!
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
index 2472da0..6712e11 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -12,16 +12,23 @@ assignees: ''
     - Refer to [README](https://github.com/nektos/act/blob/master/README.md).
 -->
 
-## Act version
+## System information
 
 <!--
-    - Paste output of `act --version` inside the code block below
-    - If you've built `act` yourself, please provide commit hash
+    - Operating System: < Windows | Linux | macOS | etc... >
+    - Architecture: < x64 (64-bit) | x86 (32-bit) | arm64 (64-bit) | arm (32-bit) | etc... >
+    - Apple M1: < yes | no >
+    - Docker version: < output of `docker system info -f "{{.ServerVersion}}"` >
+    - Docker image used in `act`: < can be omitted if it's included in log >
+    - `act` version: < output of `act --version`, if you've built `act` yourself, please provide commit hash >
 -->
 
-```none
-
-```
+- Operating System:
+- Architecture:
+- Apple M1:
+- Docker version:
+- Docker image used in `act`:
+- `act` version:
 
 ## Expected behaviour
 
diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml
deleted file mode 100644
index bb91f2f..0000000
--- a/.github/linters/.markdown-lint.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default state for all rules
-default: true
-
-# MD013/line-length - Line length
-MD013: false
-
-# MD033/no-inline-html - Inline HTML
-MD033: false
-
-# MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading
-MD041: false
diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml
new file mode 120000
index 0000000..7e62b3d
--- /dev/null
+++ b/.github/linters/.markdown-lint.yml
@@ -0,0 +1 @@
+../../.markdownlint.yml
\ No newline at end of file
diff --git a/.markdownlint.yml b/.markdownlint.yml
new file mode 100644
index 0000000..bb91f2f
--- /dev/null
+++ b/.markdownlint.yml
@@ -0,0 +1,11 @@
+# Default state for all rules
+default: true
+
+# MD013/line-length - Line length
+MD013: false
+
+# MD033/no-inline-html - Inline HTML
+MD033: false
+
+# MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading
+MD041: false