diff --git a/.drone.yml b/.drone.yml
index 3a4f7b9..a8cca08 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,8 +6,6 @@ name: default
 steps:
 - name: kaniko
   image: ghcr.io/finitum/drone-kaniko:0.7.0
-  when:
-    branch: [master]
   settings:
     cache: true
     username:
@@ -16,17 +14,4 @@ steps:
       from_secret: REGISTRY_PASSWORD
     registry: harbor.voidcorp.nl
     repo: library/galerie
-    tags: latest
-- name: kaniko-test
-  image: ghcr.io/finitum/drone-kaniko:0.7.0
-  when:
-    branch: [test]
-  settings:
-    cache: true
-    username:
-      from_secret: REGISTRY_USER
-    password:
-      from_secret: REGISTRY_PASSWORD
-    registry: harbor.voidcorp.nl
-    repo: library/galerie
-    tags: test
\ No newline at end of file
+    tags: ${DRONE_COMMIT_BRANCH}
\ No newline at end of file