diff --git a/.drone.yml b/.drone.yml
index a4807ee..4605d35 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -57,13 +57,40 @@ steps:
   depends_on:
     - "go-build-bin-amd64"
   when:
-    event:
-      - tag
     branch:
       - main
 
 # Build Containers for each architecture DEV
 - name: docker-build-image-amd64-dev
+  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
+    tags:
+      - latest
+    auto_tag_suffix: -dev
+    platforms: linux/amd64
+    dockerfile: /drone/src/Docker/Dockerfile.amd64
+    nocache: true
+  depends_on:
+    - "go-build-bin-amd64"
+  when:
+    branch:
+      - dev
+
+# Build Containers for each architecture TAGGED
+- name: docker-build-image-amd64-tagged
   image: thegeeklab/drone-docker-buildx
   volumes:
   - name: docker_socket
@@ -80,7 +107,7 @@ steps:
     repo: gitea.voser.cloud/container/iwilldie
     registry: https://gitea.voser.cloud
     auto_tag: true
-    auto_tag_suffix: dev
+    auto_tag_suffix:
     platforms: linux/amd64
     dockerfile: /drone/src/Docker/Dockerfile.amd64
     nocache: true
@@ -89,8 +116,6 @@ steps:
   when:
     event:
       - tag
-    branch:
-      - dev
 
 # Run go tests
 - name: binary-cleanup
@@ -108,6 +133,7 @@ steps:
     - "go-build-bin-amd64"
     - "docker-build-image-amd64-dev"
     - "docker-build-image-amd64-prod"
+    - "docker-build-image-amd64-tagged"
 
 
 # Volumes to mount between steps