diff --git a/.drone.yml b/.drone.yml
index 021f006..d8c9dcb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
       branch:
         include:
           - master
-          # - feature/*
+          - feature/*
   - name: deploy
     image: maven:3.8-openjdk-18-slim
     environment:
@@ -43,12 +43,29 @@ steps:
       repo: gittr.ch/java/labyrinth
       tags:
         - latest
-        - ${DRONE_SEMVER}
       dockerfile: docker/Dockerfile
-      # auto_tag: true
-      # auto_tag_suffix: "-ci"
-      debug: true
-      launch_debug: true
     when:
       branch:
-        - feature/docker
+        - master
+      event:
+        exclude:
+          - pull_request
+          - tag
+  - name: build_docker_image_release
+    image: plugins/docker
+    settings:
+      registry: gittr.ch
+      username: manuel
+      password:
+        from_secret: docker-token
+      repo: gittr.ch/java/labyrinth
+      tags:
+        - latest
+        - ${DRONE_TAG}
+      dockerfile: docker/Dockerfile
+    when:
+      branch:
+        - master
+      event:
+        include:
+          - tag