diff --git a/ansible/roles/cluster_infra/tasks/main.yml b/ansible/roles/cluster_infra/tasks/main.yml
index 5976b133c..f62c2579d 100644
--- a/ansible/roles/cluster_infra/tasks/main.yml
+++ b/ansible/roles/cluster_infra/tasks/main.yml
@@ -10,20 +10,20 @@
 # outputs.cluster_gateway_ip.
 - block:
     - name: Look up floating IP
-      include_role:
-        name: stackhpc.terraform.infra
-        tasks_from: lookup_floating_ip
-      vars:
-        os_floating_ip_id: "{{ cluster_floating_ip }}"
+      azimuth_cloud.terraform.os_floating_ip_info:
+         floating_ip: "{{ cluster_floating_ip }}"
+      register: cluster_floating_ip_info
 
     - name: Set floating IP address fact
       set_fact:
-        cluster_floating_ip_address: "{{ os_floating_ip_info.floating_ip_address }}"
-  when: cluster_floating_ip is defined
+        cluster_floating_ip_address: "{{ cluster_floating_ip_info.floating_ip.floating_ip_address }}"
+  when:
+    - cluster_floating_ip is defined
+    - cluster_floating_ip
 
 - name: Install Terraform binary
   include_role:
-    name: stackhpc.terraform.install
+    name: azimuth_cloud.terraform.install
 
 - name: Make Terraform project directory
   file:
@@ -59,4 +59,4 @@
 
 - name: Provision infrastructure
   include_role:
-    name: stackhpc.terraform.infra
+    name: azimuth_cloud.terraform.infra
diff --git a/requirements.yml b/requirements.yml
index da6ac5d29..fccd0dea2 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -43,9 +43,9 @@ collections:
     version: 3.7.2
   - name: openstack.cloud
     version: 2.1.0
-  - name: https://github.com/stackhpc/ansible-collection-terraform
+  - name: https://github.com/azimuth-cloud/ansible-collection-terraform
     type: git
-    version: 0.2.0
+    version: 0.4.0
   - name: https://github.com/azimuth-cloud/ansible-collection-image-utils
     type: git
     version: main # update on release