diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a5e453a..6caebb5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @ClickTrap-Media/oss-maintainer
+* @lazybytez/oss-maintainer
diff --git a/.github/ISSUE_TEMPLATE/a-question.md b/.github/ISSUE_TEMPLATE/a-question.md
new file mode 100644
index 0000000..69474af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/a-question.md
@@ -0,0 +1,20 @@
+---
+name: A question
+about: Ask a question
+title: "TITLEHERE"
+labels: C5 - question
+assignees: ''
+
+---
+
+**Is your question related to a feature? If so, please describe:**  
+A clear and concise description of what the question is about. Ex. I don't know how [...]
+
+**Is your question related to a problem? If so, please describe:**  
+A clear and concise description of what the question is about. Ex. I can't create [...]
+
+**Is your question related to something other? Please describe:**  
+A clear and concise description of what the question is about. Ex. Shouldn't the file [...]
+
+**Additional context:**  
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/a-request-for-a-new-feature.md
similarity index 55%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/a-request-for-a-new-feature.md
index 116f42a..2bf7e4e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/a-request-for-a-new-feature.md
@@ -1,20 +1,20 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'C1 - enhancement'
-assignees: pascal-zarrad
-
----
-
-**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.
+---
+name: A request for a new feature
+about: Suggest an idea for this project
+title: "TITLEHERE"
+labels: C2 - feature
+assignees: ''
+
+---
+
+**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/an-improvement-of-an-existing-feature.md b/.github/ISSUE_TEMPLATE/an-improvement-of-an-existing-feature.md
new file mode 100644
index 0000000..1bfeda3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/an-improvement-of-an-existing-feature.md
@@ -0,0 +1,20 @@
+---
+name: An improvement of an existing feature
+about: Suggest an idea for this project
+title: "TITLEHERE"
+labels: C3 - enhancement
+assignees: ''
+
+---
+
+**Is your feature improvement related to a problem? Please describe:**  
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the improvement you'd like:**  
+A clear and concise description of what should be improved.
+
+**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/bug-report--critical-.md b/.github/ISSUE_TEMPLATE/bug-report--critical-.md
new file mode 100644
index 0000000..fc65fd3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report--critical-.md
@@ -0,0 +1,30 @@
+--- 
+name: Bug report [Critical]
+about: Report a bug to help us improve
+title: "TITLEHERE"
+labels: C1 - bug, T3 - medium
+assignees: ''
+
+---
+
+**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
+
+**Expected behavior:**  
+A clear and concise description of what you expected to happen.
+
+**Screenshots:**  
+If applicable, add screenshots to help explain your problem.
+
+**Platform (please complete the following information):**  
+ - OS: [e.g. Windows 10, Ubuntu 18.04]
+
+**Additional context:**  
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug-report--hard-.md b/.github/ISSUE_TEMPLATE/bug-report--hard-.md
new file mode 100644
index 0000000..6d4e6f6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report--hard-.md
@@ -0,0 +1,30 @@
+--- 
+name: Bug report [Medium]
+about: Report a bug to help us improve
+title: "TITLEHERE"
+labels: C1 - bug, T2 - hard
+assignees: ''
+
+---
+
+**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
+
+**Expected behavior:**  
+A clear and concise description of what you expected to happen.
+
+**Screenshots:**  
+If applicable, add screenshots to help explain your problem.
+
+**Platform (please complete the following information):**  
+ - OS: [e.g. Windows 10, Ubuntu 18.04]
+
+**Additional context:**  
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug-report--medium-.md b/.github/ISSUE_TEMPLATE/bug-report--medium-.md
new file mode 100644
index 0000000..6ec5053
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report--medium-.md
@@ -0,0 +1,30 @@
+--- 
+name: Bug report [Normal]
+about: Report a bug to help us improve
+title: "TITLEHERE"
+labels: C1 - bug, T3 - medium
+assignees: ''
+
+---
+
+**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
+
+**Expected behavior:**  
+A clear and concise description of what you expected to happen.
+
+**Screenshots:**  
+If applicable, add screenshots to help explain your problem.
+
+**Platform (please complete the following information):**  
+ - OS: [e.g. Windows 10, Ubuntu 18.04]
+
+**Additional context:**  
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c1e2c28..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'C2 - bug'
-assignees: pascal-zarrad
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Execute command "..."
-2. Type "..."
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Environment:**
- - OS: [e.g. Linux]
- - Dist: [e.g. Ubuntu]
- - Shell: [e.g. Bash]
-
-**Additional context**
-Add any other context about the problem here.
-
-**Don't forget to add labels!**
diff --git a/.github/ISSUE_TEMPLATE/improvements-or-additions-to-documentation.md b/.github/ISSUE_TEMPLATE/improvements-or-additions-to-documentation.md
new file mode 100644
index 0000000..ec7203d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improvements-or-additions-to-documentation.md
@@ -0,0 +1,17 @@
+---
+name: Improvements or additions to documentation
+about: Improvements or additions to documentation
+title: "TITLEHERE"
+labels: C4 - documentation
+assignees: ''
+
+---
+
+**What do you want to improve? Please describe:**  
+A clear and concise description of what you want to improve.
+
+**What do you want to add? Please describe:**  
+A clear and concise description of what you want to add.
+
+**Additional context:**  
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index a80a433..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### Description
-What does your PR solve? If new features where added by your PR, what are the features?
-
-### Issue relations
-To which issue(s) is your PR related? Use keywords (for example "Closes #1") to link your issues properly.
-
-### Test Scenarios
-Describe how reviewers can verify that your changes do work from a functional perspective.
-
-### Additional information
-Add here additional information if applicable or remove this section.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..c6469af
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,16 @@
+## Description
+A clear and concise description of what the pull request does. Ex. It`s a feature with [...]
+
+## Related issue
+Please link your related issue here. Ex: 
+Closes / Resolves / Fixes #123
+
+## How can this be tested?
+Please provide a clear and concise description on how this pull request can be tested. 
+Ex. Set bot token in config. Start the bot. The bot successfully connects [...]
+
+## Motivation and context
+Why did you want this and how? (optional)
+
+## Additional context
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml
index fa8b54f..0081efd 100644
--- a/.github/workflows/deploy_release.yml
+++ b/.github/workflows/deploy_release.yml
@@ -8,7 +8,7 @@ on:
             - 'main'
 
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -44,7 +44,7 @@ jobs:
         git_tag_prefix: "v"
 
     - name: Changelog
-      uses: scottbrenner/generate-changelog-action@master
+      uses: Bullrich/generate-release-changelog@master
       id: Changelog
       env:
         REPO: ${{ github.repository }}
diff --git a/LICENSE b/LICENSE
index feffe14..209b27d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 ClickTrap Media
+Copyright (c) 2021 Lazy Bytez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/SECURITY.md b/SECURITY.md
index a821d12..40b109f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,8 +12,11 @@ Legend: :white_check_mark: supported - :ballot_box_with_check: support on critic
 
 If you find a security issue, we advise you to _not_ create an issue on GitHub for it, as 
 it could put all users on risk. 
-Please send an e-mail to [security@clicktrap-media.de](mailto:security@clicktrap-media.de) to report such issues.
+Please send an e-mail to [this mail][reportmail] to report such issues.
 
 We take security issues serious and will not create an GitHub issue for any critical security issue 
 until we have supplied a fix. All communication with the contributor of the issue will be held through e-mail
 until we are at a point where we can release information about the issue publicly.
+
+<!-- Variables -->
+[reportmail]: mailto:p.zarrad@outlook.de
diff --git a/package.json b/package.json
index 0ab546e..d47c107 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gatsby-plugin-klaro",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "A GatsbyJS plugin to include KIProtect Klaro in a site",
     "keywords": [
         "gatsby",
@@ -8,15 +8,15 @@
         "klaro",
         "cmp"
     ],
-    "author": "ClickTrap Media <contact@clicktrap-media.de>",
+    "author": "Lazy Bytez <p.zarrad@outlook.de>",
     "license": "MIT",
-    "homepage": "https://github.com/ClickTrap-Media/gatsby-plugin-klaro",
+    "homepage": "https://github.com/lazybytez/gatsby-plugin-klaro",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/ClickTrap-Media/gatsby-plugin-klaro.git"
+        "url": "git+https://github.com/lazybytez/gatsby-plugin-klaro.git"
     },
     "bugs": {
-        "url": "https://github.com/ClickTrap-Media/gatsby-plugin-klaro/issues"
+        "url": "https://github.com/lazybytez/gatsby-plugin-klaro/issues"
     },
     "main": "index.js",
     "private": false,