diff --git a/.drone.star b/.drone.star
index e6fc3e393c..f4c43d59a5 100644
--- a/.drone.star
+++ b/.drone.star
@@ -68,6 +68,7 @@ config = {
         "services/ocdav",
         "services/ocs",
         "services/proxy",
+        "services/search",
         "services/settings",
         "services/sharing",
         "services/storage-system",
diff --git a/services/search/pkg/search/index/index_test.go b/services/search/pkg/search/index/index_test.go
index 036f1e20aa..7391d18a2e 100644
--- a/services/search/pkg/search/index/index_test.go
+++ b/services/search/pkg/search/index/index_test.go
@@ -196,6 +196,7 @@ var _ = Describe("Index", func() {
 						Ref: &searchmsg.Reference{
 							ResourceId: &searchmsg.ResourceID{
 								StorageId: ref.ResourceId.StorageId,
+								SpaceId:   ref.ResourceId.SpaceId,
 								OpaqueId:  ref.ResourceId.OpaqueId,
 							},
 						},
diff --git a/services/search/pkg/search/provider/searchprovider_test.go b/services/search/pkg/search/provider/searchprovider_test.go
index c04299c4dd..0badf5e715 100644
--- a/services/search/pkg/search/provider/searchprovider_test.go
+++ b/services/search/pkg/search/provider/searchprovider_test.go
@@ -222,19 +222,20 @@ var _ = Describe("Searchprovider", func() {
 				grantSpace = &sprovider.StorageSpace{
 					SpaceType: "grant",
 					Owner:     otherUser,
-					Id:        &sprovider.StorageSpaceId{OpaqueId: "otherspaceroot!otherspacegrant"},
-					Root:      &sprovider.ResourceId{StorageId: "otherspaceroot", OpaqueId: "otherspacegrant"},
+					Id:        &sprovider.StorageSpaceId{OpaqueId: "storageproviderid$spaceid!otherspacegrant"},
+					Root:      &sprovider.ResourceId{StorageId: "storageproviderid", SpaceId: "spaceid", OpaqueId: "otherspacegrant"},
 					Name:      "grantspace",
 				}
 				mountpointSpace = &sprovider.StorageSpace{
 					SpaceType: "mountpoint",
 					Owner:     otherUser,
-					Id:        &sprovider.StorageSpaceId{OpaqueId: "otherspaceroot!otherspacemountpoint"},
-					Root:      &sprovider.ResourceId{StorageId: "otherspaceroot", OpaqueId: "otherspacemountpoint"},
+					Id:        &sprovider.StorageSpaceId{OpaqueId: "storageproviderid$spaceid!otherspacemountpoint"},
+					Root:      &sprovider.ResourceId{StorageId: "storageproviderid", SpaceId: "spaceid", OpaqueId: "otherspacemountpoint"},
 					Name:      "mountpointspace",
 					Opaque: &typesv1beta1.Opaque{
 						Map: map[string]*typesv1beta1.OpaqueEntry{
-							"grantStorageID": {Decoder: "plain", Value: []byte("otherspaceroot")},
+							"grantStorageID": {Decoder: "plain", Value: []byte("storageproviderid")},
+							"grantSpaceID":   {Decoder: "plain", Value: []byte("spaceid")},
 							"grantOpaqueID":  {Decoder: "plain", Value: []byte("otherspacegrant")},
 						},
 					},