diff --git a/workspaces/orchestrator/.changeset/fix-review-empty-formdata.md b/workspaces/orchestrator/.changeset/fix-review-empty-formdata.md
deleted file mode 100644
index e5bed1af89..0000000000
--- a/workspaces/orchestrator/.changeset/fix-review-empty-formdata.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@red-hat-developer-hub/backstage-plugin-orchestrator-form-react': patch
----
-
-fix: avoid Review step crash when form data is empty (for example display-only `ActiveText` with no submitted values). `generateReviewTableData` returns `{}` instead of undefined, and `NestedReviewTable` handles missing data.
diff --git a/workspaces/orchestrator/.changeset/new-books-matter.md b/workspaces/orchestrator/.changeset/new-books-matter.md
deleted file mode 100644
index dbef34c04d..0000000000
--- a/workspaces/orchestrator/.changeset/new-books-matter.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@red-hat-developer-hub/backstage-plugin-orchestrator': patch
----
-
-Fix UI styling issues in worfkflow results page
diff --git a/workspaces/orchestrator/.changeset/sharp-dots-sing.md b/workspaces/orchestrator/.changeset/sharp-dots-sing.md
deleted file mode 100644
index 6e2106e1a3..0000000000
--- a/workspaces/orchestrator/.changeset/sharp-dots-sing.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets': patch
-'@red-hat-developer-hub/backstage-plugin-orchestrator-form-react': patch
----
-
-Fix multi-step workflow forms dropping or misplacing async validation errors and deep nested field paths.
-
-- @red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets: Fix safeSet deep paths and sequential async validation in getExtraErrors.
-
-- @red-hat-developer-hub/backstage-plugin-orchestrator-form-react: Wrap extraErrors with the active step key so RJSF matches the root schema.
diff --git a/workspaces/orchestrator/plugins/orchestrator-form-react/CHANGELOG.md b/workspaces/orchestrator/plugins/orchestrator-form-react/CHANGELOG.md
index 74fe44013d..4f0e89409f 100644
--- a/workspaces/orchestrator/plugins/orchestrator-form-react/CHANGELOG.md
+++ b/workspaces/orchestrator/plugins/orchestrator-form-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @red-hat-developer-hub/backstage-plugin-orchestrator-form-react
 
+## 2.5.8
+
+### Patch Changes
+
+- 1d7ac98: fix: avoid Review step crash when form data is empty (for example display-only `ActiveText` with no submitted values). `generateReviewTableData` returns `{}` instead of undefined, and `NestedReviewTable` handles missing data.
+- 1d7ac98: Fix multi-step workflow forms dropping or misplacing async validation errors and deep nested field paths.
+  - @red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets: Fix safeSet deep paths and sequential async validation in getExtraErrors.
+  - @red-hat-developer-hub/backstage-plugin-orchestrator-form-react: Wrap extraErrors with the active step key so RJSF matches the root schema.
+
 ## 2.5.7
 
 ### Patch Changes
diff --git a/workspaces/orchestrator/plugins/orchestrator-form-react/package.json b/workspaces/orchestrator/plugins/orchestrator-form-react/package.json
index 260a1347f9..8682a8329c 100644
--- a/workspaces/orchestrator/plugins/orchestrator-form-react/package.json
+++ b/workspaces/orchestrator/plugins/orchestrator-form-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-orchestrator-form-react",
   "description": "Web library for the orchestrator-form plugin",
-  "version": "2.5.7",
+  "version": "2.5.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/workspaces/orchestrator/plugins/orchestrator-form-widgets/CHANGELOG.md b/workspaces/orchestrator/plugins/orchestrator-form-widgets/CHANGELOG.md
index 3ee1864cc4..459eafeb6d 100644
--- a/workspaces/orchestrator/plugins/orchestrator-form-widgets/CHANGELOG.md
+++ b/workspaces/orchestrator/plugins/orchestrator-form-widgets/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets
 
+## 1.6.8
+
+### Patch Changes
+
+- 1d7ac98: Fix multi-step workflow forms dropping or misplacing async validation errors and deep nested field paths.
+  - @red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets: Fix safeSet deep paths and sequential async validation in getExtraErrors.
+  - @red-hat-developer-hub/backstage-plugin-orchestrator-form-react: Wrap extraErrors with the active step key so RJSF matches the root schema.
+
 ## 1.6.7
 
 ### Patch Changes
diff --git a/workspaces/orchestrator/plugins/orchestrator-form-widgets/package.json b/workspaces/orchestrator/plugins/orchestrator-form-widgets/package.json
index 436bd1b9fe..7e49e12e56 100644
--- a/workspaces/orchestrator/plugins/orchestrator-form-widgets/package.json
+++ b/workspaces/orchestrator/plugins/orchestrator-form-widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/workspaces/orchestrator/plugins/orchestrator/CHANGELOG.md b/workspaces/orchestrator/plugins/orchestrator/CHANGELOG.md
index d33f830138..5ef1cb97e7 100644
--- a/workspaces/orchestrator/plugins/orchestrator/CHANGELOG.md
+++ b/workspaces/orchestrator/plugins/orchestrator/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @red-hat-developer-hub/backstage-plugin-orchestrator
 
+## 5.4.7
+
+### Patch Changes
+
+- 1d7ac98: Fix UI styling issues in worfkflow results page
+- Updated dependencies [1d7ac98]
+- Updated dependencies [1d7ac98]
+  - @red-hat-developer-hub/backstage-plugin-orchestrator-form-react@2.5.8
+
 ## 5.4.6
 
 ### Patch Changes
diff --git a/workspaces/orchestrator/plugins/orchestrator/package.json b/workspaces/orchestrator/plugins/orchestrator/package.json
index 66c7dd7d34..057018863d 100644
--- a/workspaces/orchestrator/plugins/orchestrator/package.json
+++ b/workspaces/orchestrator/plugins/orchestrator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-orchestrator",
-  "version": "5.4.6",
+  "version": "5.4.7",
   "license": "Apache-2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",