diff --git a/.drone.yml b/.drone.yml
index ca819f9..19eccc3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,26 +4,73 @@ type: docker
 name: main
 
 steps:
-  - name: Tag commit
-    image: alpine
+  - name: fetch tags
+    image: alpine/git
     commands:
-      - echo This would create a tag
+      - git fetch --tags
+  - name: update version and changelog
+    image: registry.riba-interactive.de/conventi:1
+  - name: commit changelog updates
+    image: alpine/git
+    commands:
+      - git add .
+      - git commit -m "[CI SKIP] version and changelog update"
+  - name: tag commit
+    image: registry.riba-interactive.de/conventi:1
+    commands:
+      - export version=$(conventi.sh get_version)
+      - git tag -am "Tagging new version $version" "$version"
+      - git push origin "$version"
 
 trigger:
   branch:
     - main
+  event:
+    - push
 ---
 kind: pipeline
 type: docker
-name: develop
+name: tag
 
 steps:
-  - name: Tag commit
+  - name: Build release
+    image: registry.riba-interactive.de/alpine-build:1
+    commands:
+      - cmake -S. -Bcmake-build-ci -DCMAKE_BUILD_TYPE=Release
+      - cd cmake-build-ci
+      - cmake --build .
+      - echo "Done"
+
+trigger:
+  event:
+    - tag
+---
+kind: pipeline
+type: docker
+name: Build and Test
+
+steps:
+  - name: Build and run tests
+    image: registry.riba-interactive.de/alpine-build:1
+    commands:
+      - cmake -S. -Bcmake-build-ci -DCMAKE_BUILD_TYPE=Debug -DENABLE_TEST_COVERAGE=on
+      - cd cmake-build-ci
+      - cmake --build .
+      - ctest -T Test -T Coverage
+
+  - name: Report test and coverage
     image: alpine
     commands:
-      - echo This would build the app and run test
+      - echo "Do some curl or so"
+    when:
+      event:
+        - pull_request
 
 trigger:
   branch:
     - develop
+    - feature/*
+
+image_pull_secrets:
+  - dockerconfig
 ...
\ No newline at end of file