diff --git a/provision_infra_servers.yml b/provision_infra_servers.yml
deleted file mode 100644
index cea731d..0000000
--- a/provision_infra_servers.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# file: provision_infra_servers.yml
-- hosts: localhost
-  connection: local
-  roles:
-    - { role: provision_infra_servers }
diff --git a/roles/provision_infra_servers/defaults/main.yml b/roles/setup_openstack_resources/defaults/main.yml
similarity index 100%
rename from roles/provision_infra_servers/defaults/main.yml
rename to roles/setup_openstack_resources/defaults/main.yml
diff --git a/roles/provision_infra_servers/tasks/main.yml b/roles/setup_openstack_resources/tasks/main.yml
similarity index 76%
rename from roles/provision_infra_servers/tasks/main.yml
rename to roles/setup_openstack_resources/tasks/main.yml
index 8dc38c2..b4a49d9 100644
--- a/roles/provision_infra_servers/tasks/main.yml
+++ b/roles/setup_openstack_resources/tasks/main.yml
@@ -1,5 +1,14 @@
 ---
-- name: Create OpenStack instances
+- name: Create keypairs
+  os_keypair:
+    state: present
+    cloud: "{{item.os_client_config_cloud | default(os_client_config_cloud) }}"
+    name: "{{ item.name }}"
+    public_key: "{{ item.contents }}"
+    validate_certs: no
+  with_items: keypairs
+
+- name: Create instances
   os_server:
     state: present
     cloud: "{{item.os_client_config_cloud | default(os_client_config_cloud) }}"
@@ -17,7 +26,7 @@
       infra_type: "{{ item.infra_type }}"
   with_items: infra_servers
 
-- name: Create OpenStack volumes
+- name: Create volumes
   os_volume:
     state: present
     cloud: "{{item.os_client_config_cloud | default(os_client_config_cloud) }}"
@@ -28,7 +37,7 @@
     - volumes
     - { skip_missing: yes }
 
-- name: Attach OpenStack volumes
+- name: Attach volumes
   os_server_volume:
     state: present
     cloud: "{{item.os_client_config_cloud | default(os_client_config_cloud) }}"
diff --git a/run.sh b/run.sh
index b162996..867972d 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-ansible-playbook -i hosts provision_infra_servers.yml -e "@infra_config.yml"
+ansible-playbook -i hosts setup_openstack_resources.yml -e "@infra_config.yml"
 ansible-playbook -i inventory/openstack.py site.yml -e "@infra_config.yml"
diff --git a/setup_openstack_resources.yml b/setup_openstack_resources.yml
new file mode 100644
index 0000000..abfc04a
--- /dev/null
+++ b/setup_openstack_resources.yml
@@ -0,0 +1,6 @@
+---
+# file: setup_openstack_resources.yml
+- hosts: localhost
+  connection: local
+  roles:
+    - { role: setup_openstack_resources }