diff --git a/.drone.yml b/.drone.yml
index d632b85..0d54e6a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -38,7 +38,7 @@ steps:
       password:
         from_secret: registry_password
       repo: registry.thegibsonhome.net/protonmail-bridge
-      tags: ${DRONE_COMMIT}
+      tags: ${DRONE_TAG}
 trigger:
   event:
     - tag
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index b89a778..fea7006 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /usr/src
 ARG TAG
 RUN git clone https://github.com/ProtonMail/proton-bridge.git proton-bridge \
     && cd proton-bridge \
-    && if [ -n "$TAG" ]; then git checkout tags/$TAG; fi \
+    && if [ -n "$TAG" ]; then echo "Using tags/$TAG..."; git checkout tags/$TAG; fi \
     && make build-nogui
 
 # Create a container for the ProtonMail Bridge.