diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..8b25ed964
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,40 @@
+changelog:
+  categories:
+    - title: Bug Fixes
+      labels:
+        - T-Defect
+
+    - title: New Features
+      labels:
+        - T-Enhancement
+      exclude:
+        labels:
+          - A-Admin-API
+          - A-Documentation
+
+    - title: Changes to the admin API
+      labels:
+        - A-Admin-API
+
+    - title: Documentation
+      labels:
+        - A-Documentation
+
+    - title: Translations
+      labels:
+        - A-I18n
+
+    - title: Internal Changes
+      labels:
+        - T-Task
+
+    - title: Other Changes
+      labels:
+        - "*"
+      exclude:
+        labels:
+          - A-Dependencies
+
+    - title: Dependency Updates
+      labels:
+        - A-Dependencies
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b48797b4f..22ae0efb5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -301,6 +301,7 @@ jobs:
       - name: Prepare a release
         uses: softprops/action-gh-release@v2
         with:
+          generate_release_notes: true
           body: |
             ### Docker image