diff --git a/apps/backoffice-v2/CHANGELOG.md b/apps/backoffice-v2/CHANGELOG.md
index b323e52f53..4e440b19f1 100644
--- a/apps/backoffice-v2/CHANGELOG.md
+++ b/apps/backoffice-v2/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @ballerine/backoffice-v2
 
+## 0.7.171
+
+### Patch Changes
+
+- Updated dependencies
+  - @ballerine/ui@0.7.171
+  - @ballerine/react-pdf-toolkit@1.2.131
+
 ## 0.7.170
 
 ### Patch Changes
diff --git a/apps/backoffice-v2/package.json b/apps/backoffice-v2/package.json
index 277c7db41c..6abf3e6409 100644
--- a/apps/backoffice-v2/package.json
+++ b/apps/backoffice-v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ballerine/backoffice-v2",
-  "version": "0.7.170",
+  "version": "0.7.171",
   "description": "Ballerine - Backoffice",
   "homepage": "https://github.com/ballerine-io/ballerine",
   "type": "module",
@@ -52,8 +52,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@ballerine/react-pdf-toolkit": "^1.2.130",
-    "@ballerine/ui": "0.7.169",
+    "@ballerine/react-pdf-toolkit": "^1.2.131",
+    "@ballerine/ui": "0.7.171",
     "@ballerine/blocks": "0.2.47",
     "@ballerine/common": "0.9.118",
     "@ballerine/workflow-browser-sdk": "0.6.142",
diff --git a/apps/kyb-app/CHANGELOG.md b/apps/kyb-app/CHANGELOG.md
index b083805940..9692455d60 100644
--- a/apps/kyb-app/CHANGELOG.md
+++ b/apps/kyb-app/CHANGELOG.md
@@ -1,5 +1,13 @@
 # kyb-app
 
+## 0.3.200
+
+### Patch Changes
+
+- Bump
+- Updated dependencies
+  - @ballerine/ui@0.7.171
+
 ## 0.3.199
 
 ### Patch Changes
diff --git a/apps/kyb-app/package.json b/apps/kyb-app/package.json
index b7f7c65878..19556c00ab 100644
--- a/apps/kyb-app/package.json
+++ b/apps/kyb-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/kyb-app",
   "private": true,
-  "version": "0.3.199",
+  "version": "0.3.200",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@ballerine/blocks": "0.2.47",
     "@ballerine/common": "^0.9.118",
-    "@ballerine/ui": "0.7.169",
+    "@ballerine/ui": "0.7.171",
     "@ballerine/workflow-browser-sdk": "0.6.142",
     "@lukemorales/query-key-factory": "^1.0.3",
     "@radix-ui/react-icons": "^1.3.0",
diff --git a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx
index 69b3560e03..c1ba3ad7f7 100644
--- a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx
+++ b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx
@@ -194,7 +194,9 @@ export const CollectionFlowUI: FunctionComponent<ICollectionFlowUIProps> = ({
           });
         }
 
-        setCollectionFlowStatus(values, CollectionFlowStatusesEnum.inprogress);
+        if (values.collectionFlow?.state?.status === CollectionFlowStatusesEnum.pending) {
+          setCollectionFlowStatus(values, CollectionFlowStatusesEnum.inprogress);
+        }
 
         stateApi.setContext(values);
 
diff --git a/packages/react-pdf-toolkit/CHANGELOG.md b/packages/react-pdf-toolkit/CHANGELOG.md
index 4a2938a787..ef70e742f1 100644
--- a/packages/react-pdf-toolkit/CHANGELOG.md
+++ b/packages/react-pdf-toolkit/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @ballerine/react-pdf-toolkit
 
+## 1.2.131
+
+### Patch Changes
+
+- Updated dependencies
+  - @ballerine/ui@0.7.171
+
 ## 1.2.130
 
 ### Patch Changes
diff --git a/packages/react-pdf-toolkit/package.json b/packages/react-pdf-toolkit/package.json
index b8a5ea1c8c..7825af98ae 100644
--- a/packages/react-pdf-toolkit/package.json
+++ b/packages/react-pdf-toolkit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/react-pdf-toolkit",
   "private": false,
-  "version": "1.2.130",
+  "version": "1.2.131",
   "types": "./dist/build.d.ts",
   "main": "./dist/react-pdf-toolkit.js",
   "module": "./dist/react-pdf-toolkit.mjs",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@ballerine/config": "^1.1.44",
-    "@ballerine/ui": "0.7.169",
+    "@ballerine/ui": "0.7.171",
     "@react-pdf/renderer": "^3.1.14",
     "@sinclair/typebox": "^0.31.7",
     "ajv": "^8.12.0",
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
index ea129ea256..782c38694b 100644
--- a/packages/ui/CHANGELOG.md
+++ b/packages/ui/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ballerine/ui
 
+## 0.7.171
+
+### Patch Changes
+
+- Bump
+
 ## 0.7.169
 
 ### Patch Changes
diff --git a/packages/ui/package.json b/packages/ui/package.json
index ca8a0a414a..ffe0cd9075 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ballerine/ui",
   "private": false,
-  "version": "0.7.169",
+  "version": "0.7.171",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/ui/src/components/atoms/inputs/Checkbox/Checkbox.tsx b/packages/ui/src/components/atoms/inputs/Checkbox/Checkbox.tsx
index 73974f8cb3..f18023b5e6 100644
--- a/packages/ui/src/components/atoms/inputs/Checkbox/Checkbox.tsx
+++ b/packages/ui/src/components/atoms/inputs/Checkbox/Checkbox.tsx
@@ -10,7 +10,7 @@ export const Checkbox = React.forwardRef<
   <Root
     ref={ref}
     className={ctw(
-      'border-primary ring-offset-background focus-visible:ring-ring data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground peer h-4 w-4 shrink-0 rounded-sm border focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+      'border-slate-900 ring-offset-background focus-visible:ring-ring data-[state=checked]:bg-white data-[state=checked]:text-slate-900 peer h-4 w-4 shrink-0 rounded-sm border focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
       className,
     )}
     {...props}
diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
index f58f6d012e..7886a698d2 160000
--- a/services/workflows-service/prisma/data-migrations
+++ b/services/workflows-service/prisma/data-migrations
@@ -1 +1 @@
-Subproject commit f58f6d012eec7ba489a35733fa7f952a052b6bc1
+Subproject commit 7886a698d221e48e4393f6a17e4f24e520a20d77
diff --git a/services/workflows-service/src/collection-flow/controllers/collection-flow.controller.ts b/services/workflows-service/src/collection-flow/controllers/collection-flow.controller.ts
index 0b49ec1384..7f1f3f5433 100644
--- a/services/workflows-service/src/collection-flow/controllers/collection-flow.controller.ts
+++ b/services/workflows-service/src/collection-flow/controllers/collection-flow.controller.ts
@@ -19,6 +19,7 @@ import {
   AnyRecord,
   CollectionFlowStatusesEnum,
   CollectionFlowStepStatesEnum,
+  DefaultContextSchema,
   TCollectionFlowState,
   TCollectionFlowStep,
 } from '@ballerine/common';
@@ -157,38 +158,53 @@ export class CollectionFlowController {
   @common.Post('/final-submission')
   async finalSubmission(@TokenScope() tokenScope: ITokenScope, @common.Body() body: FinishFlowDto) {
     try {
-      await this.collectionFlowStateService.updateCollectionFlowState(
+      const { eventName, context } = body;
+
+      const collectionFlowState = (context.collectionFlow as AnyRecord)
+        .state as TCollectionFlowState;
+
+      if (collectionFlowState?.status === CollectionFlowStatusesEnum.edit) {
+        const pluginsOutput = this.collectionFlowService.removePluginsOutput({
+          context: context as DefaultContextSchema,
+          plugins: [
+            'businessInformation',
+            'companySanctions',
+            'merchantScreening',
+            'merchantMonitoring',
+            'riskEvaluation',
+          ],
+        });
+
+        context.pluginsOutput = pluginsOutput;
+      }
+
+      await this.workflowService.updateWorkflowRuntimeData(
         tokenScope.workflowRuntimeDataId,
         {
-          ...((body.context.collectionFlow as AnyRecord).state as TCollectionFlowState),
-          steps: (
-            (body.context.collectionFlow as AnyRecord).state as TCollectionFlowState
-          ).steps.map((step: TCollectionFlowStep) => ({
-            ...step,
-            state: CollectionFlowStepStatesEnum.completed,
-          })),
-          status: CollectionFlowStatusesEnum.completed,
+          context,
         },
-        [tokenScope.projectId],
+        tokenScope.projectId,
       );
 
-      await this.workflowService.event(
+      await this.collectionFlowStateService.updateCollectionFlowState(
+        tokenScope.workflowRuntimeDataId,
         {
-          id: tokenScope.workflowRuntimeDataId,
-          name: body.eventName,
+          ...((context.collectionFlow as AnyRecord).state as TCollectionFlowState),
+          steps: ((context.collectionFlow as AnyRecord).state as TCollectionFlowState).steps.map(
+            (step: TCollectionFlowStep) => ({
+              ...step,
+              state: CollectionFlowStepStatesEnum.completed,
+            }),
+          ),
+          status: CollectionFlowStatusesEnum.completed,
         },
         [tokenScope.projectId],
-        tokenScope.projectId,
       );
 
       return this.workflowService.event(
         {
           id: tokenScope.workflowRuntimeDataId,
-          name: BUILT_IN_EVENT.DEEP_MERGE_CONTEXT,
-          payload: {
-            newContext: body.context,
-            arrayMergeOption: ARRAY_MERGE_OPTION.REPLACE,
-          },
+          name: eventName,
         },
         [tokenScope.projectId],
         tokenScope.projectId,
@@ -198,6 +214,7 @@ export class CollectionFlowController {
         throw error;
       }
 
+      this.appLogger.error(error);
       try {
         await this.workflowService.event(
           {
diff --git a/services/workflows-service/src/collection-flow/services/collection-flow.service.ts b/services/workflows-service/src/collection-flow/services/collection-flow.service.ts
index 0b2bc4a987..997e514e89 100644
--- a/services/workflows-service/src/collection-flow/services/collection-flow.service.ts
+++ b/services/workflows-service/src/collection-flow/services/collection-flow.service.ts
@@ -227,4 +227,14 @@ export class CollectionFlowService {
       { shouldDownloadFromSource: false },
     );
   }
+
+  removePluginsOutput({ context, plugins }: { context: DefaultContextSchema; plugins: string[] }) {
+    const pluginsOutput = structuredClone(context.pluginsOutput || {});
+
+    plugins.forEach(pluginName => {
+      delete pluginsOutput[pluginName as keyof typeof pluginsOutput];
+    });
+
+    return pluginsOutput;
+  }
 }