diff --git a/tests/config/drone/setup-eos.sh b/tests/config/drone/setup-eos.sh
index 37159cea07e..4c46dda613a 100755
--- a/tests/config/drone/setup-eos.sh
+++ b/tests/config/drone/setup-eos.sh
@@ -7,17 +7,17 @@ do
     sleep 5
 done
 
-docker-compose exec -d ocis /start-ldap
+docker-compose  -f ./docker-compose-eos-ci.yml 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
+docker-compose -f ./docker-compose-eos-ci.yml exec ocis id einstein
+docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis kill reva-users
+docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis run reva-users
+docker-compose -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis kill reva-storage-home
+docker-compose -f ./docker-compose-eos-ci.yml 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 -f ./docker-compose-eos-ci.yml exec ocis /ocis/bin/ocis kill reva-storage-home-data
+docker-compose -f ./docker-compose-eos-ci.yml exec -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data
 
diff --git a/tests/spawn_eos.sh b/tests/spawn_eos.sh
index d69b8668b41..146011923fb 100755
--- a/tests/spawn_eos.sh
+++ b/tests/spawn_eos.sh
@@ -25,13 +25,11 @@ ssh -tt root@$IPADDR git clone https://github.com/owncloud/ocis.git /ocis
 ssh -tt root@$IPADDR "cd /ocis && git checkout $DRONE_COMMIT_ID"
 
 # Create necessary files
-# ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-config.json.sh"
-# ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-config.json.sh"
-
-ssh -tt root@$IPADDR "cd /ocis/config && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-identifier-registration.sh"
+ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-config.json.sh"
+ssh -tt root@$IPADDR "cd /ocis/tests/config/drone && OCIS_DOMAIN=${IPADDR} bash /ocis/tests/config/drone/create-identifier-registration.sh"
 
 # run ocis with eos
-ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} docker-compose up -d"
+ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} docker-compose -f ./docker-compose-eos-ci.yml up -d"
 
 # Some necessary configuration for eos
 ssh -tt root@$IPADDR "cd /ocis && bash /ocis/tests/config/drone/setup-eos.sh"