diff --git a/roles/rke/defaults/main.yml b/roles/rke/defaults/main.yml
index 2cf72df..cbb2ad9 100644
--- a/roles/rke/defaults/main.yml
+++ b/roles/rke/defaults/main.yml
@@ -4,7 +4,7 @@
 kube_cloud_provider: "{{ lookup('env', 'KUBE_CLOUD_PROVIDER') }}"
 kube_cloud_conf: "{{ lookup('env', 'KUBE_CLOUD_CONF') | b64decode }}"
 # Whether to use the in-tree cloud provider or external cloud-provider
-kube_in_tree_provider: true
+kube_in_tree_provider: false
 
 # cluster settings
 cluster_hostname: "{{ lookup('env', 'CLUSTER_HOSTNAME') | default(inventory_hostname, true) }}"
diff --git a/roles/rke/tasks/common.yaml b/roles/rke/tasks/common.yaml
index abd3b61..b2c3540 100644
--- a/roles/rke/tasks/common.yaml
+++ b/roles/rke/tasks/common.yaml
@@ -101,5 +101,5 @@
   wait_for:
     path: /etc/rancher/node/password
     state: present
-    timeout: 180
+    timeout: 1800
 
diff --git a/roles/rke/tasks/registration.yaml b/roles/rke/tasks/registration.yaml
index b8dcf47..6e09a3f 100644
--- a/roles/rke/tasks/registration.yaml
+++ b/roles/rke/tasks/registration.yaml
@@ -26,9 +26,9 @@
 - name: Install OpenStack Cloud Controller Manager
   shell: kubectl apply -f {{ item }}
   with_items:
-    - https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/cluster/addons/rbac/cloud-controller-manager-roles.yaml
-    - https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/cluster/addons/rbac/cloud-controller-manager-role-bindings.yaml
-    - https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
+    - https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/manifests/controller-manager/cloud-controller-manager-roles.yaml
+    - https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
+    - https://gist.githubusercontent.com/almahmoud/b02942eb2b18ea14123e163e069a79e2/raw/b59139b17d697c9075ce3870ad7e88c567851d8a/openstack-ds.yaml
   when: not kube_in_tree_provider and kube_cloud_provider == "openstack"
 
 - name: Patch node-selector on OpenStack because of https://github.com/rancher/k3s/issues/1869
diff --git a/roles/rke/templates/ebs_storage_class.j2 b/roles/rke/templates/ebs_storage_class.j2
index 1076585..dff8934 100644
--- a/roles/rke/templates/ebs_storage_class.j2
+++ b/roles/rke/templates/ebs_storage_class.j2
@@ -39,7 +39,7 @@ provisioner: kubernetes.io/cinder
 provisioner: cinder.csi.openstack.org
 {% endif %}
 parameters:
-  availability: melbourne-qh2
+  availability: nova
 {% else %}
 provisioner: rancher.io/local-path
 {% endif %}
diff --git a/roles/rke/templates/rke2_config.j2 b/roles/rke/templates/rke2_config.j2
index e3ddb9a..c2fd6e7 100644
--- a/roles/rke/templates/rke2_config.j2
+++ b/roles/rke/templates/rke2_config.j2
@@ -1,4 +1,4 @@
-node-name: "{{ ansible_hostname if 'jetstream' in ansible_fqdn else ansible_fqdn }}"
+node-name: "{{ ansible_hostname if 'jetstream' in ansible_fqdn or 'js2local' in ansible_fqdn else ansible_fqdn }}"
 token: {{ rke_registration_token }}
 
 {% if 'controllers' in group_names %}