diff --git a/roles/copr/backend/templates/provision/nova_cloud_vars.yml b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
index 8a99b13649..ccea179280 100644
--- a/roles/copr/backend/templates/provision/nova_cloud_vars.yml
+++ b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
@@ -5,8 +5,10 @@ OS_TENANT_ID: "{{ copr_nova_tenant_id }}"
 OS_TENANT_NAME: "{{ copr_nova_tenant_name }}"
 
 OS_USERNAME: "{{ copr_nova_username }}"
-OS_PASSWORD_OLD: "{{ copr_nova_password }}"
-OS_PASSWORD: "{{ copr_password }}"
+
+# remove default values after transition to the new cloud is finished
+OS_PASSWORD_OLD: "{{ copr_nova_password|default('variable OS_PASSWORD_OLD is undefined') }}"
+OS_PASSWORD: "{{ copr_password|default('variable OS_PASSWORD is undefined')}}"
 
 
 image_name: "{{ copr_builder_image_name }}"