diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go
index d7f76d76c7..271fbecd58 100644
--- a/storage/pkg/command/appprovider.go
+++ b/storage/pkg/command/appprovider.go
@@ -98,12 +98,17 @@ func appProviderConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"appprovider": map[string]interface{}{
-					"driver":        cfg.Reva.AppProvider.Driver,
-					"demo":          map[string]interface{}{},
-					"wopiinsecure":  cfg.Reva.AppProvider.WopiInsecure,
-					"iopsecret":     cfg.Reva.AppProvider.IopSecret,
-					"wopiurl":       cfg.Reva.AppProvider.WopiURL,
-					"wopibridgeurl": cfg.Reva.AppProvider.WopiBridgeURL,
+					"app_provider_url": cfg.Reva.AppProvider.ExternalAddr,
+					"driver":           "wopi", //TODO: make configurable
+					"drivers": map[string]interface{}{
+						"wopi": map[string]interface{}{
+							"app_name":             "CS3 WOPI server",
+							"insecure_connections": cfg.Reva.AppProvider.WopiDriver.Insecure,
+							"iop_secret":           cfg.Reva.AppProvider.WopiDriver.IopSecret,
+							"wopi_url":             cfg.Reva.AppProvider.WopiDriver.WopiURL,
+							"app_url":              cfg.Reva.AppProvider.WopiDriver.AppURL,
+						},
+					},
 				},
 			},
 		},
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 0d7f03526e..37b7dcdaad 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -162,12 +162,6 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
 				},
 				"appregistry": map[string]interface{}{
 					"driver": "static",
-					"static": map[string]interface{}{
-						"rules": map[string]interface{}{
-							//TODO: add types configuration
-							"application/vnd.oasis.opendocument.text": cfg.Reva.AppProvider.Endpoint,
-						},
-					},
 				},
 				"storageregistry": map[string]interface{}{
 					"driver": cfg.Reva.StorageRegistry.Driver,
diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go
index ff9eb02180..534a70d9c8 100644
--- a/storage/pkg/config/config.go
+++ b/storage/pkg/config/config.go
@@ -42,11 +42,15 @@ type StorageRegistry struct {
 // AppProvider defines the available app provider configuration
 type AppProvider struct {
 	Port
-	Driver        string
-	IopSecret     string
-	WopiInsecure  bool
-	WopiURL       string
-	WopiBridgeURL string
+	ExternalAddr string
+	WopiDriver   WopiDriver
+}
+
+type WopiDriver struct {
+	IopSecret string
+	Insecure  bool
+	WopiURL   string
+	AppURL    string
 }
 
 // Sharing defines the available sharing configuration.
diff --git a/storage/pkg/flagset/appprovider.go b/storage/pkg/flagset/appprovider.go
index 18b5d7db8e..da8d328f11 100644
--- a/storage/pkg/flagset/appprovider.go
+++ b/storage/pkg/flagset/appprovider.go
@@ -39,50 +39,52 @@ func AppProviderWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"APP_PROVIDER_BASIC_GRPC_ADDR"},
 			Destination: &cfg.Reva.AppProvider.GRPCAddr,
 		},
+		&cli.StringFlag{
+			Name:        "external-addr",
+			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.ExternalAddr, "127.0.0.1:9164"),
+			Usage:       "Address to connect to the storage service for other services",
+			EnvVars:     []string{"APP_PROVIDER_BASIC_EXTERNAL_ADDR"},
+			Destination: &cfg.Reva.AppProvider.ExternalAddr,
+		},
 		&cli.StringSliceFlag{
 			Name:    "service",
 			Value:   cli.NewStringSlice("appprovider"),
 			Usage:   "--service appprovider [--service otherservice]",
 			EnvVars: []string{"APP_PROVIDER_BASIC_SERVICES"},
 		},
+
+		// WOPI driver
 		&cli.StringFlag{
-			Name:        "driver",
-			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.Driver, "demo"),
-			Usage:       "app provider driver",
-			EnvVars:     []string{"APP_PROVIDER_DRIVER"},
-			Destination: &cfg.Reva.AppProvider.Driver,
-		},
-		&cli.StringFlag{
-			Name:        "iopsecret",
-			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.IopSecret, ""),
+			Name:        "wopi-driver-iopsecret",
+			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiDriver.IopSecret, ""),
 			Usage:       "IOP Secret (Shared with WOPI server)",
-			EnvVars:     []string{"APP_PROVIDER_IOP_SECRET"},
-			Destination: &cfg.Reva.AppProvider.IopSecret,
+			EnvVars:     []string{"APP_PROVIDER_WOPI_DRIVER_IOP_SECRET"},
+			Destination: &cfg.Reva.AppProvider.WopiDriver.IopSecret,
 		},
 		&cli.BoolFlag{
-			Name:        "wopiinsecure",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.AppProvider.WopiInsecure, false),
+			Name:        "wopi-driver-insecure",
+			Value:       flags.OverrideDefaultBool(cfg.Reva.AppProvider.WopiDriver.Insecure, false),
 			Usage:       "Disable SSL certificate verification of WOPI server and WOPI bridge",
-			EnvVars:     []string{"APP_PROVIDER_WOPI_INSECURE"},
-			Destination: &cfg.Reva.AppProvider.WopiInsecure,
+			EnvVars:     []string{"APP_PROVIDER_WOPI_DRIVER_INSECURE"},
+			Destination: &cfg.Reva.AppProvider.WopiDriver.Insecure,
 		},
 		&cli.StringFlag{
-			Name:        "wopiurl",
-			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiURL, ""),
+			Name:        "wopi-driver-wopiurl",
+			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiDriver.WopiURL, ""),
 			Usage:       "WOPI server URL",
-			EnvVars:     []string{"APP_PROVIDER_WOPI_URL"},
-			Destination: &cfg.Reva.AppProvider.WopiURL,
+			EnvVars:     []string{"APP_PROVIDER_WOPI_DRIVER_WOPI_URL"},
+			Destination: &cfg.Reva.AppProvider.WopiDriver.WopiURL,
 		},
+
 		&cli.StringFlag{
-			Name:        "wopibridgeurl",
-			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiBridgeURL, ""),
-			Usage:       "WOPI bridge URL",
-			EnvVars:     []string{"APP_PROVIDER_WOPI_BRIDGE_URL"},
-			Destination: &cfg.Reva.AppProvider.WopiBridgeURL,
+			Name:        "wopi-driver-appurl",
+			Value:       flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiDriver.AppURL, ""),
+			Usage:       "App server URL",
+			EnvVars:     []string{"APP_PROVIDER_WOPI_DRIVER_APP_URL"},
+			Destination: &cfg.Reva.AppProvider.WopiDriver.AppURL,
 		},
 
 		// Gateway
-
 		&cli.StringFlag{
 			Name:        "gateway-url",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"),