diff --git a/.drone.star b/.drone.star
index d68ff626897..9e1f4ff5a60 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1,8 +1,8 @@
 config = {
   'apiTests': {
-    'coreBranch': 'master',
-    'coreCommit': 'e9850b40657ff78f32cb5585ec00342fe07a5ff2',
-    'numberOfParts': 4
+    'coreBranch': 'uid-gid-user-create',
+    'coreCommit': 'c731fc3ba0858811aef6d3b56002f67b6f9f42f8',
+    'numberOfParts': 1
   },
   'uiTests': {
     'phoenixBranch': 'master',
diff --git a/start-eos.sh b/start-eos.sh
new file mode 100644
index 00000000000..a70d5af546a
--- /dev/null
+++ b/start-eos.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+docker-compose exec -d ocis /start-ldap
+
+# time for ldap service to starup within ocis container
+sleep 5
+
+# Configure ocis
+docker-compose exec ocis id einstein
+docker-compose exec ocis /ocis/bin/ocis kill reva-users
+docker-compose exec ocis /ocis/bin/ocis run reva-users
+docker-compose exec ocis /ocis/bin/ocis kill reva-storage-home
+docker-compose exec -e REVA_STORAGE_HOME_DRIVER=eoshome -e REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 ocis ./bin/ocis run reva-storage-home
+docker-compose exec ocis /ocis/bin/ocis kill reva-storage-home-data
+docker-compose exec -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data
+
+
diff --git a/tests/config/drone/setup-eos.sh b/tests/config/drone/setup-eos.sh
index 37159cea07e..f3e1f0eee8b 100755
--- a/tests/config/drone/setup-eos.sh
+++ b/tests/config/drone/setup-eos.sh
@@ -7,6 +7,21 @@ do
     sleep 5
 done
 
+docker-compose down
+
+echo $OCIS_DOMAIN
+
+OCIS_DOMAIN=${OCIS_DOMAIN} docker-compose exec up -d
+
+# wait for ocis to start
+until $(curl -k --output /dev/null --silent --head --fail https://localhost:9200);
+do
+    echo '.'
+    sleep 5
+done
+
+sleep 5
+
 docker-compose exec -d ocis /start-ldap
 
 # time for ldap service to starup within ocis container
diff --git a/tests/spawn_eos.sh b/tests/spawn_eos.sh
index 1cdb689abd4..8cf719c61a0 100755
--- a/tests/spawn_eos.sh
+++ b/tests/spawn_eos.sh
@@ -33,4 +33,4 @@ ssh -tt root@$IPADDR "cd /ocis/config && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/
 ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} docker-compose up -d"
 
 # Some necessary configuration for eos
-ssh -tt root@$IPADDR "cd /ocis && bash /ocis/tests/config/drone/setup-eos.sh"
+ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/setup-eos.sh"