diff --git a/tests/deploy.sh b/tests/deploy.sh
old mode 100644
new mode 100755
index e57207d9..cad10a20
--- a/tests/deploy.sh
+++ b/tests/deploy.sh
@@ -24,10 +24,20 @@ expect "*$*"
 send -- "./unstack.sh\n"
 expect "*$*"
 send -- "./stack.sh\n"
-expect "*Would you like to start it now?*"
+expect "*/usr/bin/service: 123: exec: status: not found*"
 send -- "y\n"
 expect "*stack.sh completed*"
 
+send -- "sudo rabbitmq-plugins enable rabbitmq_management\n"
+expect "*$*"
+send -- "sudo service rabbitmq-server restart\n"
+expect "*$*"
+send -- "sudo rabbitmqctl add_user keero keero\n"
+expect "*$*"
+send -- "sudo rabbitmqctl set_user_tags keero administrator\n"
+expect "*$*"
+
+
 send -- "source openrc admin admin\n"
 expect "*$*"
 
@@ -37,7 +47,7 @@ expect "*$*"
 send -- "nova keypair-add keero-linux-keys > heat_key.priv\n"
 expect "*$*"
 
-send -- "glance image-create --name 'ws-2012-full-agent' --is-public true --container-format ovf --disk-format qcow2 < ws-2012-full-agent.qcow2\n"
+send -- "glance image-create --name 'ws-2012-full' --is-public true --container-format ovf --disk-format qcow2 < ws-2012-full.qcow2\n"
 expect "*$*"
 
 send -- "cd ~/keero\n"
@@ -50,33 +60,22 @@ send -- "cp -Rf ~/keero/dashboard/windc /opt/stack/horizon/openstack_dashboard/d
 expect "*$*"
 send -- "cp -f ~/keero/dashboard/api/windc.py /opt/stack/horizon/openstack_dashboard/api/\n"
 expect "*$*"
-send -- "cp -Rf ~/keero/dashboard/windcclient /opt/stack/horizon/\n"
+send -- "cd ~/keero/python-portasclient\n"
 expect "*$*"
-send -- "cd ~/keero/windc\n"
+send -- "sudo python setup.py install\n"
 expect "*$*"
-send -- "rm -rf windc.sqlite\n"
+send -- "cd ~/keero/portas\n"
 expect "*$*"
-send -- "./tools/with_venv.sh ./bin/windc-api --config-file=./etc/windc-api-paste.ini --dbsync\n"
+send -- "./tools/with_venv.sh ./bin/portas-api --config-file=./etc/portas-api.conf & > ~/APIservice.log\n"
+sleep 10
+send -- "\n"
+expect "*$*"
+send -- "cd ~/keero/conductor\n"
+expect "*$*"
+send -- "./tools/with_venv.sh ./bin/app.py & > ~/conductor.log\n"
+sleep 10
+send -- "\n"
 expect "*$*"
 send -- "logout\n"
 expect "*#*"
 
-send -- "rabbitmq-plugins enable rabbitmq_management\n"
-expect "*#*"
-send -- "service rabbitmq-server restart\n"
-expect "*#*"
-send -- "rabbitmqctl add_user keero keero\n"
-expect "*#*"
-send -- "rabbitmqctl set_user_tags keero administrator\n"
-expect "*#*"
-
-send -- "su - stack\n"
-expect "*$*"
-send -- "cd /opt/stack/devstack\n"
-expect "*$*"
-send -- "source openrc admin admin\n"
-expect "*$*"
-send -- "cd /opt/stack/keero/windc\n"
-expect "*$*"
-send -- "sudo ./tools/with_venv.sh ./bin/windc-api --config-file=./etc/windc-api-paste.ini > /opt/stack/tests_windc_daemon.log &\n"
-expect "*$*"