gistfile1.txt

diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 32b7031..2794ec8 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -52,7 +52,7 @@ install_dependencies(){
         unzip terraform_0.10.5_linux_amd64.zip
         sudo mv terraform /usr/local/bin
     fi
-       
+
     pip install --upgrade pip
 
     if ! which ansible; then
@@ -128,7 +128,7 @@ execute_remote(){
     local host=$3
     shift 3
 
-    ssh -A -q -t -i ${base_dir}/build-${cluster}/test.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null core@bastion1.$cluster.eu-central-1.aws.gigantic.io -- ssh -t -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${host}.$cluster.eu-central-1.aws.gigantic.io "$*"
+    ssh -A -q -t -i ${base_dir}/build-${cluster}/test.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q -i ${base_dir}/build-${cluster}/test.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@bastion1.${cluster}.eu-central-1.aws.gigantic.io" test@${host}.${cluster}.eu-central-1.aws.gigantic.io -- "$*"
 }
 
 execute_remote_master(){
@@ -167,8 +167,8 @@ vault1.$cluster.eu-central-1.aws.gigantic.io
 
 [bootstrap_node:vars]
 ansible_python_interpreter="/root/bin/python"
-ansible_ssh_user=core
-ansible_ssh_common_args='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ProxyCommand="ssh -W %h:%p -q -i ${base_dir}/build-${cluster}/test.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no core@bastion1.$cluster.eu-central-1.aws.gigantic.io"'
+ansible_ssh_user=test
+ansible_ssh_common_args='-i ${base_dir}/build-${cluster}/test.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ProxyCommand="ssh -W %h:%p -q -i ${base_dir}/build-${cluster}/test.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@bastion1.$cluster.eu-central-1.aws.gigantic.io"'
 EOF
 
     cat <<EOF > ./envs/$cluster.yml
@@ -308,7 +308,7 @@ run_e2e(){
     # replace default E2E_FOCUS value
     sed -i "s/Pods should be submitted and removed/$e2e_focus/" ./examples/quickstart/aggregate.yaml
 
-    scp -i ${base_dir}/build-${cluster}/test.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q -i ${base_dir}/build-${cluster}/test.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no core@bastion1.$cluster.eu-central-1.aws.gigantic.io" ./examples/quickstart/aggregate.yaml core@master1.$cluster.eu-central-1.aws.gigantic.io:/home/core
+    scp -i ${base_dir}/build-${cluster}/test.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q -i ${base_dir}/build-${cluster}/test.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@bastion1.$cluster.eu-central-1.aws.gigantic.io" ./examples/quickstart/aggregate.yaml test@master1.$cluster.eu-central-1.aws.gigantic.io:/home/core
 
     execute_remote_master $cluster $base_dir "./kubectl apply -f ./aggregate.yaml"