diff --git a/test/common/testlib.py b/test/common/testlib.py
index 6c1c608a49bd..9dd6eee84bc4 100644
--- a/test/common/testlib.py
+++ b/test/common/testlib.py
@@ -2652,7 +2652,7 @@ def skipOstree(reason: str) -> Callable[[_FT], _FT]:
 
 
 def isBeibootLogin() -> bool:
-    return "ws-container" in os.getenv("TEST_SCENARIO", "")
+    return True
 
 
 def skipWsContainer(reason: str) -> Callable[[_FT], _FT]:
@@ -2664,7 +2664,7 @@ def skipWsContainer(reason: str) -> Callable[[_FT], _FT]:
 
 def skipBeiboot(reason: str) -> Callable[[_FT], _FT]:
     """Decorator for skipping a test with cockpit/ws in beiboot mode"""
-    if isBeibootLogin():
+    if testvm.DEFAULT_IMAGE in OSTREE_IMAGES or isBeibootLogin():
         return unittest.skip(f"{testvm.DEFAULT_IMAGE}: {reason}")
     return lambda testEntity: testEntity
 
diff --git a/test/image-prepare b/test/image-prepare
index 7fbca311f94d..1e19e2233431 100755
--- a/test/image-prepare
+++ b/test/image-prepare
@@ -155,7 +155,10 @@ def build_install_ostree(dist_tars: list[str], image: str, *, verbose: bool, qui
     args += [
         "--upload", os.path.join(BASE_DIR, "containers") + ":/var/tmp/",
         "--script", os.path.join(TEST_DIR, "ws-container.install"),
-        "--script", os.path.join(TEST_DIR, "ostree.install"),
+        "--run-command", ("rpm-ostree install -C --uninstall=cockpit-networkmanager --uninstall=cockpit-bridge "
+        "--uninstall=cockpit-system --uninstall=glib-networking python3"),
+        # run cockpit/ws once to generate certificate; avoids slow down on every start
+        "--run-command", "podman container runlabel INSTALL cockpit/ws",
         "--upload", os.path.join(BASE_DIR, "dist/playground") + ":/usr/local/share/cockpit/"]
     return args
 
diff --git a/test/ostree.install b/test/ostree.install
deleted file mode 100644
index 6fa787936512..000000000000
--- a/test/ostree.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# install/upgrade RPMs that apply to OSTree
-set -eu
-
-cd /var/tmp/
-
-# Note: cockpit-selinux would be desirable, but needs setroubleshoot-server which isn't installed
-rpm-ostree install --cache-only cockpit-bridge-*.rpm \
-    cockpit-networkmanager-*.rpm cockpit-system-*.rpm
-
-# run cockpit/ws once to generate certificate; avoids slow down on every start
-podman container runlabel INSTALL cockpit/ws