diff --git a/tripleo_ansible/playbooks/cli-baremetal-clean.yaml b/tripleo_ansible/playbooks/cli-baremetal-clean.yaml
index 9d403a6ce..2872a70fa 100644
--- a/tripleo_ansible/playbooks/cli-baremetal-clean.yaml
+++ b/tripleo_ansible/playbooks/cli-baremetal-clean.yaml
@@ -37,7 +37,7 @@
     # Pre-cleaning validation
     - name: Run Validations
       command: >-
-        openstack tripleo validator run --group "pre-clean"
+        openstack --os-cloud undercloud tripleo validator run --group "pre-clean"
       when:
         - run_validations | bool
 
diff --git a/tripleo_ansible/playbooks/cli-baremetal-introspect.yaml b/tripleo_ansible/playbooks/cli-baremetal-introspect.yaml
index 22673f47d..ca68c60c2 100644
--- a/tripleo_ansible/playbooks/cli-baremetal-introspect.yaml
+++ b/tripleo_ansible/playbooks/cli-baremetal-introspect.yaml
@@ -39,7 +39,7 @@
     # Pre-introspection validation
     - name: Run Validations
       command: >
-        openstack tripleo validator run --group "pre-introspection"
+        openstack --os-cloud undercloud tripleo validator run --group "pre-introspection"
       when:
         - run_validations | bool
 
diff --git a/tripleo_ansible/playbooks/cli-overcloud-delete.yaml b/tripleo_ansible/playbooks/cli-overcloud-delete.yaml
index 8b77a711a..b5a5fb73b 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-delete.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-delete.yaml
@@ -45,7 +45,7 @@
     #                   https://github.com/ansible/ansible/issues/60449
     - name: Delete container and objects
       command: >
-        openstack container delete "{{ item }}" --recursive
+        openstack --os-cloud undercloud container delete "{{ item }}" --recursive
       failed_when:
         - container_objects.rc != 0
         - "'Not Found' not in container_objects.stderr"
diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-import.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-import.yaml
index 8c0275bb8..37e1fe849 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-import.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-import.yaml
@@ -77,7 +77,7 @@
 
     - name: Make nodes available
       command: >-
-        openstack baremetal node manage {{ item.uuid }} --wait 1200
+        openstack --os-cloud undercloud baremetal node manage {{ item.uuid }} --wait 1200
       loop: "{{ new_nodes }}"
       async: 2400
       poll: 0
diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-provide.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-provide.yaml
index a268020ca..c17f3ed3a 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-provide.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-provide.yaml
@@ -48,7 +48,7 @@
     # Set nodes to available
     - name: Make nodes available
       command: >-
-        openstack baremetal node provide {{ item }} --wait 1200
+        openstack --os-cloud undercloud baremetal node provide {{ item }} --wait 1200
       loop: "{{ node_uuids_provide }}"
       async: 2400
       poll: 0
@@ -72,7 +72,7 @@
 
     - name: Wait for nova resources
       command: >-
-        openstack hypervisor show {{ item }}
+        openstack --os-cloud undercloud hypervisor show {{ item }}
       loop: "{{ node_uuids_provide }}"
       changed_when: false
       register: hypervisor_check
@@ -83,7 +83,7 @@
     # Power off nodes the nodes
     - name: Power off nodes
       command: >-
-        openstack baremetal node power off {{ item }}
+        openstack --os-cloud undercloud baremetal node power off {{ item }}
       loop: "{{ node_uuids_provide }}"
       async: 2400
       poll: 0