diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..23fc3b8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug, enhancement
+assignees: ashaduri
+
+---
+
+**Version and Environment**
+ - GSmartControl version: [Are you using the latest released version or git?]
+ - OS: [e.g. openSUSE Linux 15.4]
+
+**Describe the Bug**
+[A clear and concise description of what the bug is].
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots**
+[If applicable, add screenshots to help explain your problem].
+
+**Additional Context**
+[Add any other context about the problem here (GTK+ version, etc...)]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..889a6ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ashaduri
+
+---
+
+**Version and Environment**
+ - GSmartControl version: [Are you using the latest released version or git?]
+ - OS: [e.g. openSUSE Linux 15.4]
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md
new file mode 100644
index 0000000..7e988b5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other-issue.md
@@ -0,0 +1,15 @@
+---
+name: Other issue
+about: Issues other than bugs and enhancements
+title: ''
+labels: ''
+assignees: ashaduri
+
+---
+
+**Version and Environment**
+ - GSmartControl version: [Are you using the latest released version or git?]
+ - OS: [e.g. openSUSE Linux 15.4]
+
+**Describe the Issue**
+[A clear and concise description of what the issue is].
diff --git a/SECURITY.md b/SECURITY.md
index b582e6d..977d8d6 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,10 +4,11 @@
 
 The following versions are supported with security updates:
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.1.x   | :white_check_mark: |
-| <= 1.0  | :x:                |
+| Version  | Supported          |
+| -------- | ------------------ |
+| git main | :white_check_mark: |
+| 1.1.x    | :white_check_mark: |
+| <= 1.0   | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/docs/_config.yml b/docs/_config.yml
index bf84b43..38f4666 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -3,5 +3,10 @@ remote_theme: rundocs/jekyll-rtd-theme
 title: GSmartControl
 description: Hard disk drive and SSD health inspection tool
 
+# Sitemap
+url: "https://gsmartcontrol.shaduri.dev" # the base hostname & protocol for your site
+plugins:
+  - jekyll-sitemap
+
 exclude:
   - CNAME