diff --git a/.drone.yml b/.drone.yml
index 7f604db..b4b91b8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -62,7 +62,8 @@ steps:
       ./packer
   - |
     packer validate \
-      -var vm_name=${DRONE_COMMIT_SHA:0:10}-$(date -d @${DRONE_BUILD_CREATED} +%Y%m%d) \
+      -only=vsphere-iso.bootstrap \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
       -var docker_username=$${DOCKER_USERNAME} \
       -var docker_password=$${DOCKER_PASSWORD} \
       -var repo_username=$${REPO_USERNAME} \
@@ -75,7 +76,7 @@ steps:
     packer build \
       -on-error=cleanup -timestamp-ui \
       -only=vsphere-iso.bootstrap \
-      -var vm_name=${DRONE_COMMIT_SHA:0:10}-$(date -d @${DRONE_BUILD_CREATED} +%Y%m%d) \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
       -var docker_username=$${DOCKER_USERNAME} \
       -var docker_password=$${DOCKER_PASSWORD} \
       -var repo_username=$${REPO_USERNAME} \
@@ -108,7 +109,7 @@ steps:
   depends_on:
   - Install Ansible Galaxy collections
   image: bv11-cr01.bessems.eu/library/packer-extended
-  pull: always
+  pull: alwaysquery(
   commands:
   - |
     sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
@@ -120,7 +121,8 @@ steps:
       ./packer
   - |
     packer validate \
-      -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -only=vsphere-iso.upgrade \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
       -var docker_username=$${DOCKER_USERNAME} \
       -var docker_password=$${DOCKER_PASSWORD} \
       -var repo_username=$${REPO_USERNAME} \
@@ -133,7 +135,7 @@ steps:
     packer build \
       -on-error=cleanup -timestamp-ui \
       -only=vsphere-iso.upgrade \
-      -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
       -var docker_username=$${DOCKER_USERNAME} \
       -var docker_password=$${DOCKER_PASSWORD} \
       -var repo_username=$${REPO_USERNAME} \