diff --git a/.drone.yml b/.drone.yml
index fa9f9eb..c0f764a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,6 +5,7 @@ name: default
 trigger:
   branch:
     - main
+    - dev
 
 platform:
   os: linux
@@ -35,7 +36,7 @@ steps:
   depends_on:
   - go-test
 
-# Build Containers for each architecture
+# Build Containers for each architecture PROD
 - name: docker-build-image-amd64
   image: thegeeklab/drone-docker-buildx
   volumes:
@@ -52,14 +53,51 @@ steps:
       from_secret: gitea_password
     repo: gitea.voser.cloud/container/iwilldie
     registry: https://gitea.voser.cloud
+    auto_tag: true
     tags:
-      - ${DRONE_COMMIT_BRANCH}
       - latest
     platforms: linux/amd64
     dockerfile: /drone/src/Docker/Dockerfile.amd64
     nocache: true
   depends_on:
     - "go-build-bin-amd64"
+  when:
+    event:
+      - merge
+      - tag
+    branch:
+      - main
+
+# Build Containers for each architecture DEV
+- name: docker-build-image-amd64
+  image: thegeeklab/drone-docker-buildx
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  - name: binaries
+    path: /drone/src/binaries/
+  privileged: true
+  commands:
+  settings:
+    username:
+      from_secret: gitea_username
+    password: 
+      from_secret: gitea_password
+    repo: gitea.voser.cloud/container/iwilldie
+    registry: https://gitea.voser.cloud
+    auto_tag: true
+    auto_tag_suffix: dev
+    platforms: linux/amd64
+    dockerfile: /drone/src/Docker/Dockerfile.amd64
+    nocache: true
+  depends_on:
+    - "go-build-bin-amd64"
+  when:
+    event:
+      - push
+      - tag
+    branch:
+      - dev
 
 # Run go tests
 - name: binary-cleanup