diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..240d09840
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "type:dependencies"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "type:dependencies"
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..6c0d01bed
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,82 @@
+theme:workflow:
+  - ".github/**"
+
+theme:build:
+  - "gradle/**"
+  - "build.gradle.kts"
+  - "**/build.gradle.kts"
+  - "gradle.properties"
+  - ".gitignore"
+
+theme:assertj:
+  - "allure-assertj/**"
+
+theme:attachments:
+  - "allure-attachments/**"
+
+theme:citrus:
+  - "allure-citrus/**"
+
+theme:cucumber-jvm:
+  - "allure-cucumber*-jvm/**"
+
+theme:descriptions-javadoc:
+  - "allure-descriptions-javadoc/**"
+
+theme:httpclient:
+  - "allure-httpclient/**"
+
+theme:model:
+  - "allure-model/**"
+
+theme:core:
+  - "allure-java-commons/**"
+  - "allure-java-commons-test/**"
+  - "allure-test-filter/**"
+
+theme:jax-rs:
+  - "allure-jax-rs/**"
+
+theme:jbehave:
+  - "allure-jbehave/**"
+
+theme:jsonunit:
+  - "allure-jsonunit/**"
+
+theme:junit4:
+  - "allure-junit4/**"
+  - "allure-junit4-aspect/**"
+
+theme:junit-platform:
+  - "allure-junit5/**"
+  - "allure-junit5-assert/**"
+  - "allure-junit-platform/**"
+
+theme:karate:
+  - "allure-karate/**"
+
+theme:okhttp:
+  - "allure-okhttp/**"
+  - "allure-okhttp3/**"
+
+theme:rest-assured:
+  - "allure-rest-assured/**"
+
+theme:scalatest:
+  - "allure-scalatest/**"
+
+theme:selenide:
+  - "allure-selenide/**"
+
+theme:servlet-api:
+  - "allure-servlet-api/**"
+
+theme:spock:
+  - "allure-spock/**"
+
+theme:spring:
+  - "allure-spring-web/**"
+
+theme:testng:
+  - "allure-testng/**"
+
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index a2939dd11..890e47a94 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -6,12 +6,17 @@ categories:
       - 'type:new feature'
   - title: '🔬 Improvements'
     labels:
-      - 'type:enhancement'
+      - 'type:improvement'
   - title: '🐞 Bug Fixes'
     labels:
       - 'type:bug'
+  - title: '⬆️ Dependency Updates'
+    labels:
+      - 'type:dependencies'
 
 change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR'
+exclude-labels:
+  - 'type:internal'
 template: |
   $CHANGES
 
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 10b3c0bb3..125e0aa58 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'hotfix-*'
 
 jobs:
   build_8:
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 000000000..163862b73
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,12 @@
+name: "Set theme labels"
+
+on:
+  - pull_request
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/labels-verify.yml b/.github/workflows/labels-verify.yml
index faf8586e1..d3067e48a 100644
--- a/.github/workflows/labels-verify.yml
+++ b/.github/workflows/labels-verify.yml
@@ -10,4 +10,4 @@ jobs:
     steps:
       - uses: zwaldowski/match-label-action@v2
         with:
-          allowed: 'type:bug, type:enhancement, type:new feature'
\ No newline at end of file
+          allowed: 'type:bug, type:enhancement, type:improvement, type:dependencies, type:internal, type:invalid'