diff --git a/roles/xos-ready/defaults/main.yml b/roles/xos-ready/defaults/main.yml
index 4c35845..d7e49f7 100644
--- a/roles/xos-ready/defaults/main.yml
+++ b/roles/xos-ready/defaults/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,11 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # xos-ready/defaults/main.yml
 
-xos_ui_port: 9000
-xos_grpc_insecure_port: 50055
-xos_grpc_secure_port: 50051
+site_name: placeholder-sitename
+site_suffix: "{{ site_name }}.test"
+
 xos_chameleon_port: 9101
+
+xos_tosca_url: "http://xos-tosca/xos-tosca"
+
diff --git a/roles/xos-ready/tasks/main.yml b/roles/xos-ready/tasks/main.yml
index 9078ccc..147367c 100644
--- a/roles/xos-ready/tasks/main.yml
+++ b/roles/xos-ready/tasks/main.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,15 +13,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # xos-ready/tasks/main.yml
 
-- name: Wait for XOS Chameleon to be ready after service onboarding #this means core is ready
-  shell: curl localhost:{{ xos_chameleon_port }}/xosapi/v1/modeldefs
-  register: result
-  until: result.stdout.find("items") != -1
-  retries: 30
-  delay: 20
-  tags:
-    - skip_ansible_lint # running a sub job
+- name: Wait for XOS Chameleon to be ready after service onboarding
+  uri:
+    url: "http://localhost:{{ xos_chameleon_port }}/xosapi/v1/modeldefs"
+    method: GET
+    status_code: 200
+    return_content: yes
+  register: xosready_chameleon
+  until: xosready_chameleon.content.find("items") != -1
+  retries: 40
+  delay: 15
+
+- name: Wait for XOS TOSCA engine to be ready after service onboarding
+  uri:
+    url: "{{ xos_tosca_url }}"
+    method: GET
+    status_code: 200
+  retries: 40
+  delay: 15
+