diff --git a/.cockpit-ci/container b/.cockpit-ci/container
index 8f6700326..1c12a2024 100644
--- a/.cockpit-ci/container
+++ b/.cockpit-ci/container
@@ -1 +1 @@
-ghcr.io/cockpit-project/tasks:2026-03-14
+ghcr.io/cockpit-project/tasks:2026-05-16
diff --git a/src/Containers.jsx b/src/Containers.jsx
index ffe9feee0..c3b45b0cc 100644
--- a/src/Containers.jsx
+++ b/src/Containers.jsx
@@ -551,7 +551,7 @@ class Containers extends React.Component {
         return {
             expandedContent: <ListingPanel colSpan='4' tabRenderers={tabs} />,
             columns,
-            initiallyExpanded: document.location.hash.substring(1) === container.Id,
+            initiallyExpanded: document.location.hash.substring(2) === container.Id,
             props: {
                 key: container.key,
                 "data-row-id": container.key,
diff --git a/src/ImageUsedBy.jsx b/src/ImageUsedBy.jsx
index b526022c9..fe4e0c470 100644
--- a/src/ImageUsedBy.jsx
+++ b/src/ImageUsedBy.jsx
@@ -27,8 +27,7 @@ const ImageUsedBy = ({ containers, showAll }) => {
                             <Button variant="link"
                                     isInline
                                     onClick={() => {
-                                        const loc = document.location.toString().split('#')[0];
-                                        document.location = `${loc}#${container.Id}`;
+                                        cockpit.location.go('#' + container.Id);
 
                                         if (!isRunning)
                                             showAll();
diff --git a/test/check-application b/test/check-application
index fb604d20f..bda1bc0e0 100755
--- a/test/check-application
+++ b/test/check-application
@@ -2365,7 +2365,7 @@ Yaml={name}.yaml
         b.click(f'{container_sel} td.pf-v6-c-table__toggle button')
         # running container, just selects it, but leaves "Only running" alone
         b.click(f"{container_sel} + tr div.ct-listing-panel-body button:contains('busybox-with-tty')")
-        b.wait_js_cond('window.location.hash === "#' + id_with_tty + '"')
+        b.wait_js_cond('window.location.hash === "#/' + id_with_tty + '"')
         b.wait_val("#containers-containers-filter", "running")
         # FIXME: expanding running container details does not actually work right now
         # b.wait_in_text("#containers-containers tr.pf-m-expanded .container-details", "sleep infinity")
@@ -2392,7 +2392,7 @@ Yaml={name}.yaml
         b.wait_not_in_text("#containers-containers", "busybox-not-started")
         container_sel = f"{self.getImageSelector(IMG_BUSYBOX_LATEST, system=auth)} + tr div.ct-listing-panel-body"
         b.click(f"{container_sel} button:contains('busybox-not-started')")
-        b.wait_js_cond(f"window.location.hash === '#{sha}'")
+        b.wait_js_cond(f"window.location.hash === '#/{sha}'")
         b.wait_val("#containers-containers-filter", "all")
         b.wait_in_text("#containers-containers", "busybox-not-started")
         # auto-expands container details