diff --git a/.drone.star b/.drone.star
index 3abaa5dc746..44432c87370 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1511,8 +1511,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []):
         "STORAGE_USERS_DRIVER_OWNCLOUD_DATADIR": "/srv/app/tmp/ocis/owncloud/data",
         "STORAGE_USERS_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/users",
         "STORAGE_METADATA_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata",
-        #"STORAGE_HOME_DATA_SERVER_URL": "http://ocis-server:9155/data",
-        #"STORAGE_USERS_DATA_SERVER_URL": "http://ocis-server:9158/data",
         "STORAGE_SHARING_USER_JSON_FILE": "/srv/app/tmp/ocis/shares.json",
         "PROXY_ENABLE_BASIC_AUTH": True,
         "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json",
diff --git a/storage/pkg/command/storagedrivers/home.go b/storage/pkg/command/storagedrivers/home.go
index d79f3ee81ce..cdd4968a6d4 100644
--- a/storage/pkg/command/storagedrivers/home.go
+++ b/storage/pkg/command/storagedrivers/home.go
@@ -78,7 +78,7 @@ func HomeDrivers(cfg *config.Config) map[string]interface{} {
 		"owncloud": map[string]interface{}{
 			"datadirectory":   cfg.Reva.UserStorage.OwnCloud.Root,
 			"upload_info_dir": cfg.Reva.UserStorage.OwnCloud.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.UserStorage.OwnCloud.ShareFolder,
+			"share_folder":    cfg.Reva.UserStorage.OwnCloud.ShareFolder,
 			"user_layout":     cfg.Reva.UserStorage.OwnCloud.UserLayout,
 			"redis":           cfg.Reva.UserStorage.OwnCloud.Redis,
 			"enable_home":     cfg.Reva.UserStorage.OwnCloud.EnableHome,
@@ -88,7 +88,7 @@ func HomeDrivers(cfg *config.Config) map[string]interface{} {
 		"owncloudsql": map[string]interface{}{
 			"datadirectory":   cfg.Reva.UserStorage.OwnCloudSQL.Root,
 			"upload_info_dir": cfg.Reva.UserStorage.OwnCloudSQL.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
+			"share_folder":    cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
 			"user_layout":     cfg.Reva.UserStorage.OwnCloudSQL.UserLayout,
 			"enable_home":     cfg.Reva.UserStorage.OwnCloudSQL.EnableHome,
 			"dbusername":      cfg.Reva.UserStorage.OwnCloudSQL.DBUsername,
@@ -117,7 +117,7 @@ func HomeDrivers(cfg *config.Config) map[string]interface{} {
 		},
 		"s3ng": map[string]interface{}{
 			"root":          cfg.Reva.UserStorage.S3NG.Root,
-			"enable_hos":    cfg.Reva.UserStorage.S3NG.EnableHome,
+			"enable_home":   cfg.Reva.UserStorage.S3NG.EnableHome,
 			"user_layout":   cfg.Reva.UserStorage.S3NG.UserLayout,
 			"share_folder":  cfg.Reva.UserStorage.S3NG.ShareFolder,
 			"s3.region":     cfg.Reva.UserStorage.S3NG.Region,
diff --git a/storage/pkg/command/storagedrivers/metadata.go b/storage/pkg/command/storagedrivers/metadata.go
index cc71fa63e91..3438c7043e1 100644
--- a/storage/pkg/command/storagedrivers/metadata.go
+++ b/storage/pkg/command/storagedrivers/metadata.go
@@ -73,7 +73,6 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 		"owncloud": map[string]interface{}{
 			"datadirectory":   cfg.Reva.MetadataStorage.OwnCloud.Root,
 			"upload_info_dir": cfg.Reva.MetadataStorage.OwnCloud.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.MetadataStorage.OwnCloud.ShareFolder,
 			"user_layout":     cfg.Reva.MetadataStorage.OwnCloud.UserLayout,
 			"redis":           cfg.Reva.MetadataStorage.OwnCloud.Redis,
 			"enable_home":     false,
diff --git a/storage/pkg/command/storagedrivers/user.go b/storage/pkg/command/storagedrivers/user.go
index a68f47a14b3..9fe3f8b9820 100644
--- a/storage/pkg/command/storagedrivers/user.go
+++ b/storage/pkg/command/storagedrivers/user.go
@@ -78,7 +78,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 		"owncloud": map[string]interface{}{
 			"datadirectory":   cfg.Reva.UserStorage.OwnCloud.Root,
 			"upload_info_dir": cfg.Reva.UserStorage.OwnCloud.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.UserStorage.OwnCloud.ShareFolder,
+			"share_folder":    cfg.Reva.UserStorage.OwnCloud.ShareFolder,
 			"user_layout":     cfg.Reva.UserStorage.OwnCloud.UserLayout,
 			"redis":           cfg.Reva.UserStorage.OwnCloud.Redis,
 			"enable_home":     false,
@@ -88,7 +88,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 		"owncloudsql": map[string]interface{}{
 			"datadirectory":   cfg.Reva.UserStorage.OwnCloudSQL.Root,
 			"upload_info_dir": cfg.Reva.UserStorage.OwnCloudSQL.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
+			"share_folder":    cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
 			"user_layout":     cfg.Reva.UserStorage.OwnCloudSQL.UserLayout,
 			"enable_home":     false,
 			"dbusername":      cfg.Reva.UserStorage.OwnCloudSQL.DBUsername,
diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml
index 21a923cc4fe..4154bd0d7cb 100644
--- a/tests/acceptance/docker/src/ocis-base.yml
+++ b/tests/acceptance/docker/src/ocis-base.yml
@@ -4,10 +4,10 @@ services:
       OCIS_URL: "https://ocis-server:9200"
       STORAGE_HOME_DRIVER: $STORAGE_DRIVER
       STORAGE_USERS_DRIVER: $STORAGE_DRIVER
+      STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/ocis/local/root
+      STORAGE_USERS_DRIVER_OWNCLOUD_DATADIR: /srv/app/tmp/ocis/owncloud/data
       STORAGE_USERS_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/users
       STORAGE_METADATA_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/metadata
-      STORAGE_HOME_DATA_SERVER_URL: http://ocis-server:9155/data
-      STORAGE_USERS_DATA_SERVER_URL: http://ocis-server:9158/data
       STORAGE_SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json
       SETTINGS_DATA_PATH: "/srv/app/tmp/ocis/settings"
       PROXY_ENABLE_BASIC_AUTH: "true"