diff --git a/roles/provision_infra_servers/defaults/main.yml b/roles/provision_infra_servers/defaults/main.yml
new file mode 100644
index 0000000..e49fd86
--- /dev/null
+++ b/roles/provision_infra_servers/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+os_client_config_cloud: envvars
diff --git a/roles/provision_infra_servers/tasks/main.yml b/roles/provision_infra_servers/tasks/main.yml
index 403a06b..9961853 100644
--- a/roles/provision_infra_servers/tasks/main.yml
+++ b/roles/provision_infra_servers/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: Create OpenStack instances
   os_server:
     state: present
-    cloud: "{{os_client_config_cloud}}"
+    cloud: "{{item.os_client_config_cloud | default(os_client_config_cloud) }}"
     name: "{{ item.name }}.{{ domainname }}"
     image: "{{ item.image }}"
     key_name: "{{ key_name }}"