diff --git a/hack/ci/devstack-on-gce-project-install.sh b/hack/ci/devstack-on-gce-project-install.sh
index fadbea5580..cb217f9ab5 100755
--- a/hack/ci/devstack-on-gce-project-install.sh
+++ b/hack/ci/devstack-on-gce-project-install.sh
@@ -96,9 +96,9 @@ function create_vm {
         --zone "${GCP_ZONE}"
     fi
 
-    if ! gcloud compute images describe devstack-${FLAVOR} --project "${GCP_PROJECT}" > /dev/null;
+    if ! gcloud compute images describe devstack-${name} --project "${GCP_PROJECT}" > /dev/null;
     then
-      gcloud compute images create devstack-${FLAVOR} \
+      gcloud compute images create devstack-${name} \
         --project "${GCP_PROJECT}" \
         --source-disk devstack-${FLAVOR} --source-disk-zone "${GCP_ZONE}" \
         --licenses "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
@@ -107,21 +107,21 @@ function create_vm {
 
   if [[ ${FLAVOR} = "preinstalled" ]]
   then
-    if ! gcloud compute images describe devstack-${FLAVOR} --project "${GCP_PROJECT}" > /dev/null;
+    if ! gcloud compute images describe "devstack-${name}" --project "${GCP_PROJECT}" > /dev/null;
     then
-      gcloud compute images create devstack-${FLAVOR} \
+      gcloud compute images create "devstack-${name}" \
         --project "${GCP_PROJECT}" \
         --source-uri gs://artifacts.k8s-staging-capi-openstack.appspot.com/test/devstack/2021-03-28/devstack.raw.tar.gz \
         --licenses "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
     fi
   fi
 
-  if ! gcloud compute instances describe openstack --project "${GCP_PROJECT}" --zone "${GCP_ZONE}" > /dev/null;
+  if ! gcloud compute instances describe "devstack-${name}" --project "${GCP_PROJECT}" --zone "${GCP_ZONE}" > /dev/null;
   then
-    gcloud compute instances create openstack \
+    gcloud compute instances create "devstack-${name}" \
       --project "${GCP_PROJECT}" \
       --zone "${GCP_ZONE}" \
-      --image devstack-${FLAVOR} \
+      --image devstack-${name} \
       --boot-disk-size 200G \
       --boot-disk-type pd-ssd \
       --can-ip-forward \