diff --git a/roles/compute-node-enable-maas/tasks/main.yml b/roles/compute-node-enable-maas/tasks/main.yml
index 5a00ad8..f84315b 100644
--- a/roles/compute-node-enable-maas/tasks/main.yml
+++ b/roles/compute-node-enable-maas/tasks/main.yml
@@ -30,11 +30,14 @@
     - openstack-compute-vtn.yaml
 
 - name: Load TOSCA to add OpenStack compute nodes, over REST
-  xostosca:
-    url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
-    user: "{{ xos_admin_user }}"
-    password:  "{{ maas_xos_admin_pass }}"
-    recipe: "{{ lookup('file', '/tmp/' + item ) }}"
+  uri:
+    url: "{{ xos_tosca_url }}/run"
+    method: POST
+    headers:
+      xos-username: "{{ xos_admin_user }}"
+      xos-password: "{{ xos_admin_pass }}"
+    body: "{{ lookup('file', '/tmp/' + item ) }}"
+    status_code: 200
   with_items:
     - openstack.yaml
     - openstack-compute.yaml
@@ -44,11 +47,13 @@
     seconds: 20
 
 - name: Load TOSCA to enable VTN on OpenStack compute nodes, over REST
-  xostosca:
-    url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
-    user: "{{ xos_admin_user }}"
-    password:  "{{ maas_xos_admin_pass }}"
-    recipe: "{{ lookup('file', '/tmp/' + item ) }}"
+  uri:
+    url: "{{ xos_tosca_url }}/run"
+    method: POST
+    headers:
+      xos-username: "{{ xos_admin_user }}"
+      xos-password: "{{ xos_admin_pass }}"
+    body: "{{ lookup('file', '/tmp/' + item ) }}"
   with_items:
     - vtn-service.yaml
     - openstack-compute-vtn.yaml