diff --git a/classes/migration/upgrade/v3_5_0/I10874_UserGroupStagesRemoveSubmission.php b/classes/migration/upgrade/v3_5_0/I10874_UserGroupStagesRemoveSubmission.php
new file mode 100644
index 0000000000..b1a75e0cd2
--- /dev/null
+++ b/classes/migration/upgrade/v3_5_0/I10874_UserGroupStagesRemoveSubmission.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file classes/migration/upgrade/v3_5_0/I10874_UserGroupStagesRemoveSubmission.php
+ *
+ * Copyright (c) 2025 Simon Fraser University
+ * Copyright (c) 2025 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class I10874_UserGroupStagesRemoveSubmission
+ *
+ * @brief Remove WORKFLOW_STAGE_ID_SUBMISSION stage from user_group_stage table
+ */
+
+namespace APP\migration\upgrade\v3_5_0;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use PKP\migration\Migration;
+
+class I10874_UserGroupStagesRemoveSubmission extends Migration
+{
+    public const WORKFLOW_STAGE_SUBMISSION = 1;
+
+    protected Collection $rowsWithSubmissionStage;
+
+    public function up(): void
+    {
+        $this->rowsWithSubmissionStage = DB::table('user_group_stage')
+            ->where('stage_id', self::WORKFLOW_STAGE_SUBMISSION)
+            ->get();
+
+        DB::table('user_group_stage')->where('stage_id', self::WORKFLOW_STAGE_SUBMISSION)->delete();
+    }
+
+    public function down(): void
+    {
+        $toInsert = [];
+        foreach ($this->rowsWithSubmissionStage as $row) { /* @var \stdClass $row */
+            $toInsert[] = [
+                'context_id' => $row->context_id,
+                'user_group_id' => $row->user_group_id,
+                'stage_id' => $row->stage_id,
+            ];
+        }
+
+        DB::table('user_group_stage')->insert($toInsert);
+    }
+}
diff --git a/cypress.config.js b/cypress.config.js
index cebd5a4e13..5f0a1bc29d 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -45,5 +45,7 @@ module.exports = defineConfig({
     experimentalRunAllSpecs: true,
   },
   // Allow cypress to interact with iframes
-  chromeWebSecurity: false
+  chromeWebSecurity: false,
+  viewportWidth: 3024,
+  viewportHeight: 1964
 })
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index d747f1a82e..49dbf5b3aa 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -146,6 +146,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I7135_CreateNewRorRegistryCacheTables"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10759_AddReviewAssignmentSettings"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10819_OrcidOauthScopeMail"/>
+		<migration class="APP\migration\upgrade\v3_5_0\I10874_UserGroupStagesRemoveSubmission"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>
 
diff --git a/lib/pkp b/lib/pkp
index 922eb775df..ecf81ba72f 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 922eb775dfa9a43d7f7fcbdcc3a19e4c557f920e
+Subproject commit ecf81ba72f15131ccc48fe89f4da5fadb2d2d5b3
diff --git a/registry/userGroups.xml b/registry/userGroups.xml
index 92847c5c60..77e8129a33 100644
--- a/registry/userGroups.xml
+++ b/registry/userGroups.xml
@@ -14,13 +14,13 @@
 
 <groups>
 	<!-- Managerial Role -->
-	<group roleId="0x00000010" stages="1,5" name="default.groups.name.manager" plural="default.groups.plural.manager" abbrev="default.groups.abbrev.manager" permitMetadataEdit="true" permitSettings="true" />
+	<group roleId="0x00000010" stages="5" name="default.groups.name.manager" plural="default.groups.plural.manager" abbrev="default.groups.abbrev.manager" permitMetadataEdit="true" permitSettings="true" />
 
 	<!--  Moderator Role -->
-	<group roleId="0x00000011" stages="1,5" name="default.groups.name.sectionEditor" plural="default.groups.plural.sectionEditor" abbrev="default.groups.abbrev.sectionEditor" permitMetadataEdit="true" masthead="true" />
+	<group roleId="0x00000011" stages="5" name="default.groups.name.sectionEditor" plural="default.groups.plural.sectionEditor" abbrev="default.groups.abbrev.sectionEditor" permitMetadataEdit="true" masthead="true" />
 
 	<!-- Author Role -->
-	<group roleId="0x00010000" stages="1,5" name="default.groups.name.author" plural="default.groups.plural.author" abbrev="default.groups.abbrev.author" permitSelfRegistration="true" permitMetadataEdit="true" />
+	<group roleId="0x00010000" stages="5" name="default.groups.name.author" plural="default.groups.plural.author" abbrev="default.groups.abbrev.author" permitSelfRegistration="true" permitMetadataEdit="true" />
 
 	<!-- Reader Role -->
 	<group roleId="0x00100000" stages="" name="default.groups.name.reader" plural="default.groups.plural.reader" abbrev="default.groups.abbrev.reader" permitSelfRegistration="true" />