diff --git a/docker-compose-eos-ci.yml b/docker-compose-eos-ci.yml
deleted file mode 100644
index ec16643acd1..00000000000
--- a/docker-compose-eos-ci.yml
+++ /dev/null
@@ -1,179 +0,0 @@
----
-version: '3.5'
-
-networks:
-  testnet:
-    name: testnet
-
-services:
-  ocis:
-    container_name: ocis
-    image: owncloud/eos-ocis-dev:latest
-    tty: true
-    privileged: true
-    stdin_open: true
-    ports:
-      - 9200:9200
-    env_file:
-      - ./config/eos-docker.env
-    hostname: ocis
-    networks:
-      - testnet
-    volumes:
-      - .:/ocis
-      - ../ocis-reva:/ocis-reva
-      - ../reva:/reva
-      - ./tests/config/drone:/eos-config
-    environment:
-      # ocis log level will be used for all services
-      OCIS_LOG_LEVEL: debug
-      # domain setup
-      # TODO currently the below lines hardcode the port to 9200, use an OCIS_URL that includes protocol and port
-      OCIS_DOMAIN: ${OCIS_DOMAIN:-localhost}
-      PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
-      KONNECTD_ISS: https://${OCIS_DOMAIN:-localhost}:9200
-      PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-localhost}:9200
-      PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-localhost}:9200/.well-known/openid-configuration
-      PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
-      REVA_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
-      REVA_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
-      # TODO make id the default in ocis-reva
-      REVA_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
-      REVA_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200
-      REVA_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
-      # common eos settings used for both drivers: eos and eoshome
-      REVA_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
-      REVA_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
-      REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users"
-      # the eos end xrdcopy binaries use this env var to find the eos mgm
-      EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
-      PHOENIX_WEB_CONFIG: /eos-config/config.json
-      KONNECTD_IDENTIFIER_REGISTRATION_CONF: /eos-config/identifier-registration.yaml
-
-  mgm-master:
-    container_name: mgm-master
-    image: owncloud/eos-mgm:4.6.5
-    tty: true
-    privileged: true
-    stdin_open: true
-    env_file:
-    - ./config/eos-docker.env
-    hostname: mgm-master.testnet
-    networks:
-    - testnet
-    volumes:
-    - eos-mgm-master-log:/var/log/eos
-    - eos-mgm-master-config:/var/eos/config
-    - eos-mgm-master-ns-queue:/var/eos/ns-queue
-    # this volume kills mgm-master during startup
-    # - ./e/master/var/eos/md:/var/eos/md
-    environment:
-      EOS_SET_MASTER: 1
-
-  mq-master:
-    container_name: mq-master
-    image: owncloud/eos-mq:4.6.5
-    tty: true
-    privileged: true
-    stdin_open: true
-    env_file:
-    - ./config/eos-docker.env
-    hostname: mq-master.testnet
-    networks:
-    - testnet
-    volumes:
-    - eos-mq-master-log:/var/log/eos
-    - eos-mq-master-config:/var/eos/config
-    - eos-mq-master-ns-queue:/var/eos/ns-queue
-    environment:
-      EOS_SET_MASTER: 1
-
-  fst:
-    container_name: fst
-    image: owncloud/eos-fst:4.6.5
-    tty: true
-    privileged: true
-    stdin_open: true
-    env_file:
-    - ./config/eos-docker.env
-    hostname: fst.testnet
-    networks:
-    - testnet
-    volumes:
-    - eos-fst-log:/var/log/eos
-    - eos-fst-disks:/disks
-    environment:
-      EOS_MGM_URL: "root://mgm-master.testnet"
-
-  quark-1:
-    container_name: quark-1
-    image: owncloud/eos-qdb:4.6.5
-    tty: true
-    privileged: true
-    stdin_open: true
-    env_file:
-    - ./config/eos-docker.env
-    hostname: quark-1.testnet
-    networks:
-    - testnet
-    volumes:
-    - eos-quarkdb1:/var/lib/quarkdb
-    environment:
-      EOS_QDB_DIR: "/var/lib/quarkdb/eosns"
-      EOS_QDB_PORT: "7777"
-      EOS_QDB_MODE: "raft"
-      EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b"
-      EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777"
-
-  quark-2:
-    container_name: quark-2
-    image: owncloud/eos-qdb:4.6.5
-    tty: true
-    privileged: true
-    stdin_open: true
-    env_file:
-    - ./config/eos-docker.env
-    hostname: quark-2.testnet
-    networks:
-    - testnet
-    volumes:
-    - eos-quarkdb2:/var/lib/quarkdb
-    environment:
-      EOS_QDB_DIR: "/var/lib/quarkdb/eosns"
-      EOS_QDB_PORT: "7777"
-      EOS_QDB_MODE: "raft"
-      EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b"
-      EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777"
-
-  quark-3:
-    container_name: quark-3
-    image: owncloud/eos-qdb:4.6.5
-    tty: true
-    privileged: true
-    stdin_open: true
-    env_file:
-    - ./config/eos-docker.env
-    hostname: quark-3.testnet
-    networks:
-    - testnet
-    volumes:
-    - eos-quarkdb3:/var/lib/quarkdb
-    environment:
-      EOS_QDB_DIR: "/var/lib/quarkdb/eosns"
-      EOS_QDB_PORT: "7777"
-      EOS_QDB_MODE: "raft"
-      EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b"
-      EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777"
-
-volumes:
-  eos-mgm-master-log:
-  eos-mgm-master-config:
-  eos-mgm-master-ns-queue:
-  eos-mq-master-log:
-  eos-mq-master-config:
-  eos-mq-master-ns-queue:
-  eos-fst-log:
-  eos-fst-disks:
-  eos-quarkdb1:
-  eos-quarkdb2:
-  eos-quarkdb3:
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d8023b790a..b49269bdbf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,7 @@ services:
       - .:/ocis
       - ../ocis-reva:/ocis-reva
       - ../reva:/reva
+      - ./config:/ocis-config
     environment:
       # ocis log level will be used for all services
       OCIS_LOG_LEVEL: debug
@@ -46,6 +47,9 @@ services:
       REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users"
       # the eos end xrdcopy binaries use this env var to find the eos mgm
       EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      # uses identifier registration from config directory
+      KONNECTD_IDENTIFIER_REGISTRATION_CONF: /ocis-config/identifier-registration.yaml
+
   
   mgm-master:
     container_name: mgm-master
diff --git a/tests/config/drone/setup-eos.sh b/tests/config/drone/setup-eos.sh
index 4c46dda613a..37159cea07e 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  -f ./docker-compose-eos-ci.yml exec -d ocis /start-ldap
+docker-compose exec -d ocis /start-ldap
 
 # time for ldap service to starup within ocis container
 sleep 5
 
 # Configure ocis
-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
+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/spawn_eos.sh b/tests/spawn_eos.sh
index 146011923fb..1cdb689abd4 100755
--- a/tests/spawn_eos.sh
+++ b/tests/spawn_eos.sh
@@ -25,11 +25,12 @@ 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-identifier-registration.sh"
+ssh -tt root@$IPADDR "mkdir -p /ocis/tests/eos-config"
+ssh -tt root@$IPADDR "cd /ocis/config && 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"
 
 # run ocis with eos
-ssh -tt root@$IPADDR "cd /ocis && OCIS_DOMAIN=${IPADDR} docker-compose -f ./docker-compose-eos-ci.yml up -d"
+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"