diff --git a/.drone.star b/.drone.star
index eceaa9c0aa0..80bee09f922 100644
--- a/.drone.star
+++ b/.drone.star
@@ -24,7 +24,8 @@ OC_UBUNTU = "owncloud/ubuntu:20.04"
 # Todo: update or remove the following images
 # https://github.com/owncloud/client/issues/10070
 OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-39-amd64"
-OC_CI_SQUISH = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64"
+OC_CI_SQUISH = "sawjan/squish:unlock"
+OC_CI_SQUISH_UP = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64"
 
 PLUGINS_GIT_ACTION = "plugins/git-action:1"
 PLUGINS_S3 = "plugins/s3"
@@ -127,6 +128,12 @@ config = {
                 "tags": "~@skipOnOCIS",
                 "skip": False,
             },
+            "ocis-2": {
+                "version": "5.0",
+                # comma separated list of tags to be used for filtering. E.g. "@tag1,@tag2"
+                "tags": "~@skipOnOCIS",
+                "skip": False,
+            },
         },
     },
 }
@@ -322,7 +329,7 @@ def unit_tests(image = OC_CI_CLIENT):
 def gui_tests(squish_parameters = "", server_type = "oc10"):
     return [{
         "name": "GUItests",
-        "image": OC_CI_SQUISH,
+        "image": OC_CI_SQUISH if server_type == "ocis" else OC_CI_SQUISH_UP,
         "environment": {
             "LICENSEKEY": from_secret("SQUISH_LICENSEKEY"),
             "GUI_TEST_REPORT_DIR": dir["guiTestReport"],
@@ -330,13 +337,13 @@ def gui_tests(squish_parameters = "", server_type = "oc10"):
             "MIDDLEWARE_URL": "http://testmiddleware:3000/",
             "BACKEND_HOST": "http://owncloud/" if server_type == "oc10" else "https://ocis:9200",
             "SECURE_BACKEND_HOST": "https://owncloud/" if server_type == "oc10" else "https://ocis:9200",
-            "OCIS": "true" if server_type == "ocis" else "false",
+            "OCIS": "true" if "ocis" in server_type else "false",
             "SERVER_INI": "%s/drone/server.ini" % dir["guiTest"],
             "SQUISH_PARAMETERS": squish_parameters,
             "STACKTRACE_FILE": "%s/stacktrace.log" % dir["guiTestReport"],
             "PLAYWRIGHT_BROWSERS_PATH": "%s/.playwright" % dir["base"],
             "OWNCLOUD_CORE_DUMP": 1,
-            "SCREEN_RECORD_ON_FAILURE": True,
+            "SCREEN_RECORD_ON_FAILURE": False,
             # allow to use any available pnpm version
             "COREPACK_ENABLE_STRICT": 0,
         },
@@ -580,7 +587,7 @@ def testMiddlewareService(server_type = "oc10"):
         "REMOTE_UPLOAD_DIR": "/uploads",
     }
 
-    if server_type == "ocis":
+    if "ocis" in server_type:
         environment["BACKEND_HOST"] = "https://ocis:9200"
         environment["TEST_WITH_GRAPH_API"] = "true"
         environment["RUN_ON_OCIS"] = "true"
diff --git a/test/gui/shared/scripts/bdd_hooks.py b/test/gui/shared/scripts/bdd_hooks.py
index 9b71ebb2475..ac754806ff2 100644
--- a/test/gui/shared/scripts/bdd_hooks.py
+++ b/test/gui/shared/scripts/bdd_hooks.py
@@ -18,6 +18,7 @@
 import shutil
 import os
 import glob
+import subprocess
 from urllib import request, error
 from datetime import datetime
 
@@ -56,12 +57,6 @@
 # Order: 1
 @OnFeatureStart
 def hook(context):
-    print("------------------")
-    test.log("------------------")
-    print(os.getenv("DBUS_SESSION_BUS_ADDRESS"))
-    test.log(str(os.getenv("DBUS_SESSION_BUS_ADDRESS")))
-    print("------------------")
-    test.log("------------------")
     init_config()