diff --git a/.drone.star b/.drone.star
index 544abb0e1..c8116afd1 100644
--- a/.drone.star
+++ b/.drone.star
@@ -2090,22 +2090,8 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
         "%s/bin/ociswrapper serve --bin %s --url %s --admin-username admin --admin-password admin" % (dirs["ocisWrapper"], ocis_bin, environment["OCIS_URL"]),
     ]
 
-    ocis = {
-        "name": container_name,
-        "image": OC_CI_GOLANG,
-        "detach": True,
-        "environment": environment,
-        "user": user,
-        "commands": [
-            "%s init --insecure true" % ocis_bin,
-            "cat $OCIS_CONFIG_DIR/ocis.yaml",
-        ] + wrapper_commands,
-        "volumes": volumes,
-        "depends_on": depends_on,
-    }
-
     wait_for_ocis = {
-        "name": "wait-for-%s" % (ocis["name"]),
+        "name": "wait-for-%s" % (container_name),
         "image": OC_CI_ALPINE,
         "commands": [
             # wait for ocis-server to be ready (5 minutes)
@@ -2117,7 +2103,19 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
     }
 
     return [
-        ocis,
+        {
+            "name": container_name,
+            "image": OC_CI_GOLANG,
+            "detach": True,
+            "environment": environment,
+            "user": user,
+            "commands": [
+                "%s init --insecure true" % ocis_bin,
+                "cat $OCIS_CONFIG_DIR/ocis.yaml",
+            ] + (wrapper_commands),
+            "volumes": volumes,
+            "depends_on": depends_on,
+        },
         wait_for_ocis,
     ]
 
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 678218e6c..245bb8166 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -95,7 +95,6 @@
             "OCIS_LDAP_URI": "ldaps://localhost:10235",
             "OCIS_RUNTIME_PORT": "10250",
             "OCIS_URL": "https://federation-ocis-server:10200",
-            // "OCIS_OIDC_ISSUER": "federation-ocis-server",
             "FRONTEND_OCS_LIST_OCM_SHARES": "true",
             "FRONTEND_ENABLE_FEDERATED_SHARING_INCOMING": "true",
             "FRONTEND_ENABLE_FEDERATED_SHARING_OUTGOING": "true",
@@ -187,9 +186,9 @@
             "OCIS_LOG_COLOR": "true",
             "PROXY_ENABLE_BASIC_AUTH": "true",
             "IDM_CREATE_DEMO_USERS": "true",
-            "OCIS_ADMIN_USER_ID": "some-admin-user-id-0000-000000000000", // FIXME currently must have the length of a UUID, see reva/pkg/storage/utils/decomposedfs/spaces.go:228
+            "OCIS_ADMIN_USER_ID": "some-admin-user-id-0000-000000000000",
             "IDM_ADMIN_PASSWORD": "admin",
-            "OCIS_SYSTEM_USER_ID": "some-system-user-id-000-000000000000", // FIXME currently must have the length of a UUID, see reva/pkg/storage/utils/decomposedfs/spaces.go:228
+            "OCIS_SYSTEM_USER_ID": "some-system-user-id-000-000000000000",
             "OCIS_SYSTEM_USER_API_KEY": "some-system-user-machine-auth-api-key",
             "OCIS_JWT_SECRET": "some-ocis-jwt-secret",
             "OCIS_MACHINE_AUTH_API_KEY": "some-ocis-machine-auth-api-key",
diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md
index f58171726..3c10257a4 100644
--- a/docs/ocis/development/testing.md
+++ b/docs/ocis/development/testing.md
@@ -587,6 +587,8 @@ To enable ocm in the web interface, you need to set the following envs:
 `FRONTEND_OCS_LIST_OCM_SHARES=true` \
 `FRONTEND_ENABLE_FEDERATED_SHARING_INCOMING=true` \
 `FRONTEND_ENABLE_FEDERATED_SHARING_OUTGOING=true`
+
+and put `ocm` to apps https://github.com/owncloud/ocis/blob/master/services/web/pkg/config/defaults/defaultconfig.go#L101
 {{< /hint>}}
 
 #### Run the Acceptance Test
diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go
index a44baf8cd..71f12720e 100644
--- a/services/web/pkg/config/defaults/defaultconfig.go
+++ b/services/web/pkg/config/defaults/defaultconfig.go
@@ -98,7 +98,7 @@ func DefaultConfig() *config.Config {
 					ResponseType: "code",
 					Scope:        "openid profile email",
 				},
-				Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings", "epub-reader", "draw-io", "ocm"},
+				Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings", "epub-reader", "draw-io"},
 				ExternalApps: []config.ExternalApp{
 					{
 						ID:   "preview",
diff --git a/tests/acceptance/features/apiOcm/ocm.feature b/tests/acceptance/features/apiOcm/ocm.feature
index 0d8d898bc..c63969156 100755
--- a/tests/acceptance/features/apiOcm/ocm.feature
+++ b/tests/acceptance/features/apiOcm/ocm.feature
@@ -1,4 +1,4 @@
-@ocm @skipOnReva
+@ocm
 Feature: an user shares resources usin ScienceMesh application
   As a user
   I want to share resources between different ocis instances