diff --git a/docs/extensions/storage/ports.md b/docs/extensions/storage/ports.md
index b50b0f6b3b3..2ab34f5dd92 100644
--- a/docs/extensions/storage/ports.md
+++ b/docs/extensions/storage/ports.md
@@ -34,8 +34,8 @@ For now, the storage service uses these ports to preconfigure those services:
 | 9159      | storage users debug                           |
 | 9160      | groups                                        |
 | 9161      | groups debug                                  |
-| 9164      | appprovider                                   |
-| 9165      | appprovider debug                             |
+| 9164      | storage appprovider                                   |
+| 9165      | storage appprovider debug                             |
 | 9178      | storage public link                           |
 | 9179      | storage public link data                      |
 | 9215      | storage meta grpc                             |
diff --git a/ocis/pkg/command/appprovider.go b/ocis/pkg/command/appprovider.go
deleted file mode 100644
index f43a491e679..00000000000
--- a/ocis/pkg/command/appprovider.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build !simple
-
-package command
-
-import (
-	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/storage/pkg/command"
-	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
-	"github.com/owncloud/ocis/storage/pkg/flagset"
-)
-
-// AppProviderCommand is the entrypoint for the reva-gateway command.
-func AppProviderCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     "app-provider",
-		Usage:    "Start appprovider for providing apps",
-		Category: "Extensions",
-		Flags:    flagset.AppProviderWithConfig(cfg.Storage),
-		Action: func(c *cli.Context) error {
-			origCmd := command.AppProvider(configureAppProvider(cfg))
-			return handleOriginalAction(c, origCmd)
-		},
-	}
-}
-
-func configureAppProvider(cfg *config.Config) *svcconfig.Config {
-	cfg.Storage.Log.Level = cfg.Log.Level
-	cfg.Storage.Log.Pretty = cfg.Log.Pretty
-	cfg.Storage.Log.Color = cfg.Log.Color
-
-	if cfg.Tracing.Enabled {
-		cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
-		cfg.Storage.Tracing.Type = cfg.Tracing.Type
-		cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
-		cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
-	}
-
-	return cfg.Storage
-}
-
-func init() {
-	register.AddCommand(AppProviderCommand)
-}