diff --git a/.drone.yml b/.drone.yml
index 31b8ed9..06e5306 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,26 @@
 kind: pipeline
 type: docker
-name: publish Docker image
+name: tag, create release and publish Docker image
 
 steps:
-  - name: publish
+  - name: bump tag
+    image: python:3.12
+    commands:
+      - git config --global user.email "drone@dikurium.ch"
+      - git config --global user.name "Drone"
+      - git config --global url."https://$GIT_USERNAME:$GIT_TOKEN@gitea.dikurium.ch/".insteadOf "https://gitea.dikurium.ch/"
+      - git config --global --add --bool push.autoSetupRemote true
+      - git fetch --tags
+      - pip install -U Commitizen
+      - cz bump
+      - git push --follow-tags
+      - cz changelog $(cz version -p) > CZ_CURRENT_CHANGELOG.md
+    environment:
+      GIT_USERNAME:
+        from_secret: git_username
+      GIT_PASSWORD:
+        from_secret: git_password
+  - name: publish Docker image
     image: plugins/docker
     settings:
       repo: gitea.dikurium.ch/InnoPeak/drone-gitea-release
@@ -15,5 +32,7 @@ steps:
         from_secret: docker_password
 
 trigger:
-  branch: [main]
-  event: [push]
+  branch:
+    - main
+  event:
+    - push
diff --git a/cz.yaml b/cz.yaml
new file mode 100644
index 0000000..31a92cd
--- /dev/null
+++ b/cz.yaml
@@ -0,0 +1,9 @@
+---
+commitizen:
+  bump_message: "chore: bump $current_version \u2192 $new_version [CI SKIP]"
+  major_version_zero: true
+  name: cz_conventional_commits
+  tag_format: $version
+  update_changelog_on_bump: true
+  version: 0.0.1
+  version_scheme: semver