diff --git a/.drone.star b/.drone.star
index dcfe945ad0..cb24d27b7c 100644
--- a/.drone.star
+++ b/.drone.star
@@ -932,9 +932,12 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4):
                              "sh %s/tests/config/drone/serve-hosting-discovery.sh" % (dirs["base"]),
                          ],
                      },
+                 ] +
+                 ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") +
+                 [
                      {
                          "name": "wopiserver",
-                         "image": "cs3org/wopiserver:v9.4.1",
+                         "image": "cs3org/wopiserver:v10.0.1",
                          "detach": True,
                          "commands": [
                              "cp %s/tests/config/drone/wopiserver.conf /etc/wopi/wopiserver.conf" % (dirs["base"]),
@@ -949,9 +952,6 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4):
                              "curl -k --fail --retry-connrefused --retry 9 --retry-all-errors 'http://wopiserver:8880/wopi'",
                          ],
                      },
-                 ] +
-                 ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") +
-                 [
                      {
                          "name": "prepare-test-file-%s" % (storage),
                          "image": OC_CI_ALPINE,
diff --git a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
index 07c37e6fd7..f5e16561d2 100644
--- a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
+++ b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
@@ -45,11 +45,11 @@ tokenvalidity = 86400
 # WOPI lock expiration time [seconds]
 wopilockexpiration = 3600
 
-# WOPI lock strict check: if True, WOPI locks will be compared according to specs,
-# that is their representation must match. False (default) allows for a more relaxed
-# comparison, which compensates incorrect lock requests from Microsoft Office Online
+# WOPI lock strict check: if True (default), WOPI locks will be compared according to specs,
+# that is their representation must match. False allows for a more relaxed comparison,
+# which compensates incorrect lock requests from Microsoft Office Online 2016-2018
 # on-premise setups.
-wopilockstrictcheck = False
+#wopilockstrictcheck = True
 
 # Enable support of rename operations from WOPI apps. This is currently
 # disabled by default as it has been observed that both MS Office and Collabora
diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml
index e36203b849..28931b26b4 100644
--- a/deployments/examples/ocis_wopi/docker-compose.yml
+++ b/deployments/examples/ocis_wopi/docker-compose.yml
@@ -161,7 +161,7 @@ services:
     restart: always
 
   wopiserver:
-    image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v9.4.0}
+    image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v10.0.1}
     networks:
       ocis-net:
     entrypoint:
@@ -187,7 +187,7 @@ services:
     restart: always
 
   collabora:
-    image: collabora/code:22.05.10.1.1
+    image: collabora/code:22.05.14.3.1
     networks:
       ocis-net:
     environment:
@@ -210,7 +210,7 @@ services:
     restart: always
 
   onlyoffice:
-    image: onlyoffice/documentserver:7.3.0
+    image: onlyoffice/documentserver:7.3.3
     networks:
       ocis-net:
     entrypoint: