diff --git a/.drone.yml b/.drone.yml
index 00e6eb5..c14be85 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,18 +16,20 @@ steps:
       - export BUILDER_ID="crosscomp-$(cat /proc/self/cgroup | head -1 | cut -d '/' -f 3)"
       - docker buildx create --use --name $BUILDER_ID --driver-opt image=stargate01/buildkit
       - docker buildx inspect --bootstrap
-      - docker login --username $REGISTRY_USERNAME --password $REGISTRY_PASSWORD registry.thegibsonhome.net
-      - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --output=type=image,push=true --progress tty -t registry.thegibsonhome.net/protonmail-bridge:latest .
+      - echo $REGISTRY_PASS | docker login --username $REGISTRY_USER --password-stdin $REGISTRY_HOST
+      - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --output=type=image,push=true --progress tty --build-args TAG=$DRONE_TAG -t $REGISTRY_HOST/$IMAGE:$DRONE_TAG -t $REGISTRY_HOST/$IMAGE:latest .
       - docker buildx rm $BUILDER_ID
     volumes:
       - name: docker_socket
         path: /var/run/docker.sock
     environment:
-      REGISTRY_USERNAME:
+      IMAGE: protonmail-bridge
+      REGISTRY_HOST: registry.thegibsonhome.net
+      REGISTRY_USER:
         from_secret: registry_username
-      REGISTRY_PASSWORD:
+      REGISTRY_PASS:
         from_secret: registry_password
 
-#trigger:
-#  event:
-#    - tag
\ No newline at end of file
+trigger:
+  event:
+    - tag
\ No newline at end of file