diff --git a/config/nodepool/clouds.yaml b/config/nodepool/clouds.yaml.j2
similarity index 100%
rename from config/nodepool/clouds.yaml
rename to config/nodepool/clouds.yaml.j2
diff --git a/inventory/testing/group_vars/nodepool.yaml b/inventory/testing/group_vars/nodepool.yaml
index 01d0c97..e623b29 100644
--- a/inventory/testing/group_vars/nodepool.yaml
+++ b/inventory/testing/group_vars/nodepool.yaml
@@ -21,5 +21,11 @@ nodepool_pip_virtualenv_python: python3
 nodepool_pip_virtualenv: /opt/venv/nodepool
 
 # windmill.openstacksdk
+openstacksdk_user_name: nodepool
+openstacksdk_user_group: nodepool
+openstacksdk_user_home: /var/lib/nodepool
+
 openstacksdk_pip_virtualenv_python: python3
 openstacksdk_pip_virtualenv: /opt/venv/nodepool
+
+openstacksdk_file_clouds_yaml_src: "{{ windmill_config_git_dest }}/nodepool/clouds.yaml.j2"
diff --git a/playbooks/nodepool.yaml b/playbooks/nodepool.yaml
index 5dc4519..db1e8d9 100644
--- a/playbooks/nodepool.yaml
+++ b/playbooks/nodepool.yaml
@@ -34,23 +34,5 @@
       include_role:
         name: openstack.openstacksdk
 
-    # TODO(pabelanger): This should be moved into ansible-role-os-client-config.
-    - name: Create os-client-config directories.
-      become: yes
-      file:
-        group: nodepool
-        owner: nodepool
-        path: /var/lib/nodepool/.config/openstack
-        state: directory
-
-    - name: Copy clouds.yaml into place.
-      become: yes
-      copy:
-        dest: /var/lib/nodepool/.config/openstack/clouds.yaml
-        group: nodepool
-        mode: 0400
-        owner: nodepool
-        src: "{{ windmill_config_git_dest }}/nodepool/clouds.yaml"
-
 - import_playbook: nodepool-builder.yaml
 - import_playbook: nodepool-launcher.yaml