diff --git a/.drone.star b/.drone.star
index f35df73228..1d2fefec49 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1477,7 +1477,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = []):
         "PROXY_ENABLE_BASIC_AUTH": True,
         "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json",
         "IDP_IDENTIFIER_REGISTRATION_CONF": "/drone/src/tests/config/drone/identifier-registration.yml",
-        "OCIS_LOG_LEVEL": "error",
+        "OCIS_LOG_LEVEL": "info",
         "SETTINGS_DATA_PATH": "/srv/app/tmp/ocis/settings",
         "OCIS_INSECURE": "true",
     }
diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go
index 574304aee0..80c8c523ba 100644
--- a/storage/pkg/command/appprovider.go
+++ b/storage/pkg/command/appprovider.go
@@ -23,10 +23,7 @@ func AppProvider(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "app-provider",
 		Usage: "Start appprovider for providing apps",
-		//Flags: flagset.AppProviderWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.AppProvider.Services = c.StringSlice("service")
-
 			return ParseConfig(c, cfg, "storage-app-provider")
 		},
 		Action: func(c *cli.Context) error {
diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go
index ef02699835..10268754a1 100644
--- a/storage/pkg/command/authbasic.go
+++ b/storage/pkg/command/authbasic.go
@@ -24,10 +24,7 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "auth-basic",
 		Usage: "Start authprovider for basic auth",
-		//Flags: flagset.AuthBasicWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.AuthBasic.Services = c.StringSlice("service")
-
 			return ParseConfig(c, cfg, "storage-auth-basic")
 		},
 		Action: func(c *cli.Context) error {
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 23de38db9b..3e40e3d431 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -31,16 +31,12 @@ func Gateway(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "gateway",
 		Usage: "Start gateway",
-		//Flags: flagset.GatewayWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.Gateway.Services = c.StringSlice("service")
-			//cfg.Reva.StorageRegistry.Rules = c.StringSlice("storage-registry-rule")
-
 			if cfg.Reva.DataGateway.PublicURL == "" {
 				cfg.Reva.DataGateway.PublicURL = strings.TrimRight(cfg.Reva.Frontend.PublicURL, "/") + "/data"
 			}
 
-			return ParseConfig(c, cfg, "storage-gatway")
+			return ParseConfig(c, cfg, "storage-gateway")
 		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go
index ac6dc55b59..abace4d50b 100644
--- a/storage/pkg/command/sharing.go
+++ b/storage/pkg/command/sharing.go
@@ -26,10 +26,7 @@ func Sharing(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "sharing",
 		Usage: "Start sharing service",
-		//Flags: flagset.SharingWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.Sharing.Services = c.StringSlice("service")
-
 			return ParseConfig(c, cfg, "storage-sharing")
 		},
 		Action: func(c *cli.Context) error {
diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go
index 89eef388fb..bbeca4d705 100644
--- a/storage/pkg/command/storagehome.go
+++ b/storage/pkg/command/storagehome.go
@@ -25,10 +25,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-home",
 		Usage: "Start storage-home service",
-		//Flags: flagset.StorageHomeWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.StorageHome.Services = c.StringSlice("service")
-
 			return ParseConfig(c, cfg, "storage-home")
 		},
 		Action: func(c *cli.Context) error {
diff --git a/storage/pkg/command/storagemetadata.go b/storage/pkg/command/storagemetadata.go
index 74864e2c68..1c84313a37 100644
--- a/storage/pkg/command/storagemetadata.go
+++ b/storage/pkg/command/storagemetadata.go
@@ -29,8 +29,6 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-metadata",
 		Usage: "Start storage-metadata service",
-		// TODO(refs) at this point it might make sense delegate log flags to each individual storage command.
-		//Flags:    flagset.StorageMetadata(cfg),
 		Before: func(c *cli.Context) error {
 			return ParseConfig(c, cfg, "storage-metadata")
 		},
diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go
index 467749aa03..d7a0a0773a 100644
--- a/storage/pkg/command/storagepubliclink.go
+++ b/storage/pkg/command/storagepubliclink.go
@@ -23,7 +23,6 @@ func StoragePublicLink(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-public-link",
 		Usage: "Start storage-public-link service",
-		//Flags:    flagset.StoragePublicLink(cfg),
 		Before: func(c *cli.Context) error {
 			return ParseConfig(c, cfg, "storage-public-link")
 		},
diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go
index 47477939e2..7bb7aa6c0f 100644
--- a/storage/pkg/command/storageusers.go
+++ b/storage/pkg/command/storageusers.go
@@ -24,10 +24,7 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "storage-users",
 		Usage: "Start storage-users service",
-		//Flags: flagset.StorageUsersWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.StorageHome.Services = c.StringSlice("service")
-
 			return ParseConfig(c, cfg, "storage-userprovider")
 		},
 		Action: func(c *cli.Context) error {
diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go
index 0586f7bfa0..34aee1d7c0 100644
--- a/storage/pkg/command/users.go
+++ b/storage/pkg/command/users.go
@@ -24,10 +24,7 @@ func Users(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "users",
 		Usage: "Start users service",
-		//Flags: flagset.UsersWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			//cfg.Reva.Users.Services = c.StringSlice("service")
-
 			return ParseConfig(c, cfg, "storage-users")
 		},
 		Action: func(c *cli.Context) error {