diff --git a/build.gradle b/build.gradle
index 92c7c39..867e73e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,7 +115,7 @@
 tasks.addRule(new DockerTagRule(project))
 tasks.addRule(new GitSubmoduleUpdateRule(project))
 
-task deploy (type: Exec) {
+task deployPlatform (type: Exec) {
     dependsOn copyAnsibleInventory
 
     println "Using deployment config: $deployConfig"
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index 5f1da1d..84d0edd 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -32,7 +32,7 @@
     -a "src=~/admin-openrc.sh dest={{ service_profile_repo_dest }}/{{ xos_configuration }}"
 
 - name: Wait for test client to complete installation
-  when: test_client_install
+  when: test_client_install is defined and test_client_install
   async_status: jid={{ test_client_playbook.ansible_job_id }}
   register: test_client_playbook_result
   until: test_client_playbook_result.finished