diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index f442f5340..5807bf9f1 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -100,3 +100,4 @@ $(REFLEX): $(BINGO_DIR)/reflex.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/reflex-v0.3.1"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=reflex.mod -o=$(GOBIN)/reflex-v0.3.1 "github.com/cespare/reflex"
+
diff --git a/.bingo/variables.env b/.bingo/variables.env
index 1deb407f4..19edcff1c 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -35,3 +35,4 @@ PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20211219183901-997c02ca
 PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.7.2"
 
 REFLEX="${GOBIN}/reflex-v0.3.1"
+
diff --git a/changelog/unreleased/update-reva.md b/changelog/unreleased/update-reva.md
new file mode 100644
index 000000000..8cb9fefcc
--- /dev/null
+++ b/changelog/unreleased/update-reva.md
@@ -0,0 +1,7 @@
+Enhancement: update reva to v2.x.x
+
+Updated reva to version 2.x.x. This update includes:
+
+  * TODO
+
+https://github.com/owncloud/ocis/pull/3430
diff --git a/go.mod b/go.mod
index 3a892cb95..8f573cbe3 100644
--- a/go.mod
+++ b/go.mod
@@ -21,8 +21,8 @@ require (
 	github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-20220118152736-9e0be6c85d75
 	github.com/blevesearch/bleve/v2 v2.3.2
 	github.com/coreos/go-oidc/v3 v3.1.0
-	github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19
-	github.com/cs3org/reva/v2 v2.1.0
+	github.com/cs3org/go-cs3apis v0.0.0-20220328105952-297bef33e13f
+	github.com/cs3org/reva/v2 v2.0.0-20220401165356-8ffc980ab7e2
 	github.com/disintegration/imaging v1.6.2
 	github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
 	github.com/go-chi/chi/v5 v5.0.7
diff --git a/go.sum b/go.sum
index 4ed032e6a..b67ce7dd8 100644
--- a/go.sum
+++ b/go.sum
@@ -335,10 +335,10 @@ github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3p
 github.com/crewjam/saml v0.4.6 h1:XCUFPkQSJLvzyl4cW9OvpWUbRf0gE7VUpU8ZnilbeM4=
 github.com/crewjam/saml v0.4.6/go.mod h1:ZBOXnNPFzB3CgOkRm7Nd6IVdkG+l/wF+0ZXLqD96t1A=
 github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4=
-github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 h1:1jqPH58jCxvbaJ9WLIJ7W2/m622bWS6ChptzljSG6IQ=
-github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.1.0 h1:l+neBj+KhwNziaI3t1NHF3eKzKxzGpSi6kVOpsZts9s=
-github.com/cs3org/reva/v2 v2.1.0/go.mod h1:kFqm3iwrRHyEnP606H+wSWmJzjk0nj2kPShsowriqxg=
+github.com/cs3org/go-cs3apis v0.0.0-20220328105952-297bef33e13f h1:emnlOWc1s2gx77MViLnZH9yh5TRHKsykRu6rJjx3lkM=
+github.com/cs3org/go-cs3apis v0.0.0-20220328105952-297bef33e13f/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
+github.com/cs3org/reva/v2 v2.0.0-20220401165356-8ffc980ab7e2 h1:vcVekB7huLKHpbPFareH3psYV6toBIjhr0R8KMGCmMI=
+github.com/cs3org/reva/v2 v2.0.0-20220401165356-8ffc980ab7e2/go.mod h1:1siLO6MV57uSyzQxPbfM6qNA9NP6aagN3/yKOE/FwtM=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go
index 45f08752a..a3c17879d 100644
--- a/storage/pkg/command/sharing.go
+++ b/storage/pkg/command/sharing.go
@@ -121,7 +121,8 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
 					"driver": cfg.Reva.Sharing.UserDriver,
 					"drivers": map[string]interface{}{
 						"json": map[string]interface{}{
-							"file": cfg.Reva.Sharing.UserJSONFile,
+							"file":         cfg.Reva.Sharing.UserJSONFile,
+							"gateway_addr": cfg.Reva.Gateway.Endpoint,
 						},
 						"sql": map[string]interface{}{ // cernbox sql
 							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
@@ -155,7 +156,8 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
 					"driver": cfg.Reva.Sharing.PublicDriver,
 					"drivers": map[string]interface{}{
 						"json": map[string]interface{}{
-							"file": cfg.Reva.Sharing.PublicJSONFile,
+							"file":         cfg.Reva.Sharing.PublicJSONFile,
+							"gateway_addr": cfg.Reva.Gateway.Endpoint,
 						},
 						"sql": map[string]interface{}{
 							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,