diff --git a/metalsmith_ansible/roles/metalsmith_deployment/defaults/main.yml b/metalsmith_ansible/roles/metalsmith_deployment/defaults/main.yml
index 9e4dd91..090af98 100644
--- a/metalsmith_ansible/roles/metalsmith_deployment/defaults/main.yml
+++ b/metalsmith_ansible/roles/metalsmith_deployment/defaults/main.yml
@@ -18,4 +18,4 @@ metalsmith_traits: []
 metalsmith_user_name: metalsmith
 
 # Wait parameters
-metalsmith_provisioning_timeout:
+metalsmith_provisioning_timeout: 3600
diff --git a/playbooks/integration/initial-setup.yaml b/playbooks/integration/initial-setup.yaml
index 1dd5a6e..2c4ca0a 100644
--- a/playbooks/integration/initial-setup.yaml
+++ b/playbooks/integration/initial-setup.yaml
@@ -23,6 +23,18 @@
       vars:
         ansible_python_interpreter: /usr/bin/python3
 
+    - name: Install the latest sdk to align with ansible
+      pip:
+        name: openstacksdk
+        state: latest
+      become: true
+      environment:
+        # NOTE(dtantsur): https://github.com/pypa/setuptools/issues/2353
+        SETUPTOOLS_USE_DISTUTILS: stdlib
+      vars:
+        ansible_python_interpreter: /usr/bin/python3
+
+
     - name: Install metalsmith
       pip:
         name: "{{ metalsmith_src_dir }}/metalsmith"