diff --git a/Makefile b/Makefile
index 201ba9fb..667b39ee 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ COCKPIT_REPO_FILES = \
 	$(NULL)
 
 COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
-COCKPIT_REPO_COMMIT = d7126448b1e74e59f75157389225289dc34c3fd5 # 297 + 19 commits
+COCKPIT_REPO_COMMIT = fabdc84bd6bb06454f7b472b523cea06d806cefc # 297 + PF5 final adjustments
 
 $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
 COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
diff --git a/package.json b/package.json
index 963d67fc..2710986d 100644
--- a/package.json
+++ b/package.json
@@ -46,12 +46,12 @@
     "stylelint-formatter-pretty": "^3.2.0"
   },
   "dependencies": {
-    "@patternfly/patternfly": "5.0.0-prerelease.8",
-    "@patternfly/react-core": "5.0.0-alpha.132",
-    "@patternfly/react-icons": "5.0.0-alpha.21",
-    "@patternfly/react-styles": "5.0.0-alpha.19",
-    "@patternfly/react-table": "5.0.0-alpha.136",
-    "@patternfly/react-tokens": "5.0.0-alpha.16",
+    "@patternfly/patternfly": "5.0.2",
+    "@patternfly/react-core": "5.0.0",
+    "@patternfly/react-icons": "5.0.0",
+    "@patternfly/react-styles": "5.0.0",
+    "@patternfly/react-table": "5.0.0",
+    "@patternfly/react-tokens": "5.0.0",
     "date-fns": "2.30.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
diff --git a/src/ostree.scss b/src/ostree.scss
index 287744ae..e7aa6568 100644
--- a/src/ostree.scss
+++ b/src/ostree.scss
@@ -71,3 +71,9 @@
 .pf-v5-c-form.pf-m-horizontal {
     width: 100%;
 }
+
+// properly align the "change-repo" inline button with the other toolbar items
+// it defaults to --pf-v5-c-button--m-inline--PaddingTop, which is 0
+.pf-v5-c-button.pf-m-link.pf-m-inline {
+    padding-top: var(--pf-v5-c-button--PaddingTop);
+}
diff --git a/test/reference b/test/reference
index 81085cab..0358a00c 160000
--- a/test/reference
+++ b/test/reference
@@ -1 +1 @@
-Subproject commit 81085cab682a0d6b2011763003182ab68dc7e0c5
+Subproject commit 0358a00c0d21932c9648b06a78060d2e867eac0f