diff --git a/changelog/unreleased/make-frontend-prefixes-configurable.md b/changelog/unreleased/make-frontend-prefixes-configurable.md
new file mode 100644
index 0000000000..becf695a3b
--- /dev/null
+++ b/changelog/unreleased/make-frontend-prefixes-configurable.md
@@ -0,0 +1,14 @@
+Enhancement: make frontend prefixes configurable
+
+We introduce three new environment variables and preconfigure them the following way:
+
+```
+REVA_FRONTEND_DATAGATEWAY_PREFIX="data"
+REVA_FRONTEND_OCDAV_PREFIX=""
+REVA_FRONTEND_OCS_PREFIX="ocs"
+```
+
+This restores the reva defaults that were changed upstream.
+
+https://github.com/owncloud/ocis-reva/pull/363
+https://github.com/cs3org/reva/pull/936/files#diff-51bf4fb310f7362f5c4306581132fc3bR63
\ No newline at end of file
diff --git a/pkg/flagset/frontend.go b/pkg/flagset/frontend.go
index 4c559a7e80..94ec4a9347 100644
--- a/pkg/flagset/frontend.go
+++ b/pkg/flagset/frontend.go
@@ -166,7 +166,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 			Value:       "ocs",
 			Usage:       "open collaboration services endpoint prefix",
 			EnvVars:     []string{"REVA_FRONTEND_OCS_PREFIX"},
-			Destination: &cfg.Reva.Frontend.OCDavPrefix,
+			Destination: &cfg.Reva.Frontend.OCSPrefix,
 		},
 
 		// Gateway