diff --git a/.drone.star b/.drone.star
index 836a0c3d33..7a72e63f2d 100644
--- a/.drone.star
+++ b/.drone.star
@@ -548,22 +548,18 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommitId, storage):
         'detach': True,
         'environment' : {
           #'OCIS_LOG_LEVEL': 'debug',
-          'STORAGE_STORAGE_HOME_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_HOME_DATA_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_OC_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_OC_DATA_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
+          'STORAGE_HOME_DRIVER': '%s' % (storage),
           'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
           'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/reva/root',
           'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
-          'STORAGE_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
           'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
           'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
           'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
           'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
-          'STORAGE_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
-          'STORAGE_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
-          'STORAGE_FRONTEND_URL': 'https://ocis-server:9200',
+          'STORAGE_HOME_EXPOSE_DATA_SERVER': 'true',
+          'STORAGE_HOME_DATA_SERVER_URL': 'http://ocis-server:9155/data',
+          'STORAGE_DATAGATEWAY_PUBLIC_URL': 'https://ocis-server:9200/data',
+          'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
           'PHOENIX_WEB_CONFIG': '/drone/src/accounts/ui/tests/config/drone/ocis-config.json',
           'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/accounts/ui/tests/config/drone/identifier-registration.yml',
           'KONNECTD_ISS': 'https://ocis-server:9200',
@@ -1406,23 +1402,21 @@ def ocisServer(storage):
       'pull': 'always',
       'detach': True,
       'environment' : {
-        #'OCIS_LOG_LEVEL': 'debug',
-        'STORAGE_STORAGE_HOME_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_HOME_DATA_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_OC_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_OC_DATA_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
+        'OCIS_LOG_LEVEL': 'debug',
+        'STORAGE_HOME_DRIVER': '%s' % (storage),
         'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
         'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
         'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
-        'STORAGE_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
         'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
         'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
         'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
         'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
-        'STORAGE_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
-        'STORAGE_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
-        'STORAGE_FRONTEND_URL': 'https://ocis-server:9200',
+        'STORAGE_HOME_EXPOSE_DATA_SERVER': 'true',
+        'STORAGE_HOME_DATA_SERVER_URL': 'http://ocis-server:9155/data',
+        'STORAGE_DATAGATEWAY_PUBLIC_URL': 'https://ocis-server:9200/data',
+        'STORAGE_USERS_EXPOSE_DATA_SERVER': 'true',
+        'STORAGE_USERS_DATA_SERVER_URL': 'http://ocis-server:9158/data',
+        'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
         'PHOENIX_WEB_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json',
         'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ocis/tests/config/drone/identifier-registration.yml',
         'KONNECTD_ISS': 'https://ocis-server:9200',