diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json
index 0f4a3ea454..18f0bf473f 100644
--- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json
+++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json
@@ -418,5 +418,15 @@
         "CRUD": "CRU"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "joSetAsideCreatedDate",
+    "UserRoles": [
+      "caseworker-civil-admin",
+      "caseworker-civil-staff",
+      "caseworker-civil-systemupdate"
+    ],
+    "CRUD": "CRU"
   }
 ]
diff --git a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
index 1b6b7b24e8..a1e8026324 100644
--- a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
+++ b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
@@ -25,7 +25,7 @@
     "Description": "Set aside judgment",
     "DisplayOrder": 1,
     "PreConditionState(s)": "All_FINAL_ORDERS_ISSUED",
-    "PostConditionState": "*",
+    "PostConditionState": "All_FINAL_ORDERS_ISSUED",
     "SecurityClassification": "Public",
     "ShowSummary": "Y",
     "ShowEventNotes": "N",
diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json
index b574da1a8d..ed2c2b79ec 100644
--- a/ccd-definition/CaseField/CaseField-JO-nonprod.json
+++ b/ccd-definition/CaseField/CaseField-JO-nonprod.json
@@ -352,5 +352,13 @@
     "FieldTypeParameter": "CoscRpaStatus",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "joSetAsideCreatedDate",
+    "Label": "Enter the date set aside is done",
+    "FieldType": "DateTime",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
   }
 ]
diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js
index aa93c762ef..b020c074b6 100644
--- a/e2e/api/steps_LRspec.js
+++ b/e2e/api/steps_LRspec.js
@@ -1561,7 +1561,7 @@ module.exports = {
     await waitForFinishedBusinessProcess(caseId);
   },
 
-  setAsideJudgment: async (user, setAsideReason, setAsideOrderType,expectedState = 'PROCEEDS_IN_HERITAGE_SYSTEM') => {
+  setAsideJudgment: async (user, setAsideReason, setAsideOrderType,expectedState = 'All_FINAL_ORDERS_ISSUED') => {
     console.log(`case in All set aside judgment ${caseId}`);
     console.log(`calling setup token *** setAside case ${caseId}  user : ${user.email}`);
     await apiRequest.setupTokens(user);
diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js
index 763a1ac3af..b26c9b08ed 100644
--- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js
+++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js
@@ -61,19 +61,7 @@ Scenario('SetAside Default Judgment Spec claim 1v1 - Record new judgment after h
     await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario);
     await api_spec.amendRespondent1ResponseDeadline(config.systemupdate);
     await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false);
-    await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'AWAITING_RESPONDENT_ACKNOWLEDGEMENT');
-    console.log('--defendantResponse--');
-    await api_spec.defendantResponse(config.defendantSolicitorUser);
-    console.log('--claimantResponse--');
-    await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario,
-      'AWAITING_APPLICANT_INTENTION');
-    console.log('--sdo--');
-    await api_spec.createSDO(judgeUser, 'CREATE_FAST_NO_SUM');
-    console.log('--createFinalOrderJO--');
-    await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER');
-    console.log('--recordJudgment--');
-    await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY');
-    await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS');
+    await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'All_FINAL_ORDERS_ISSUED');
   }
 });
 
diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js
index 0ed5fd4e30..880ac4711c 100644
--- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js
+++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js
@@ -32,22 +32,7 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside After Order  - Record new
     await api_spec.amendRespondent1ResponseDeadline(config.systemupdate);
     await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false);
     console.log('--setAsideJudgment--');
-    await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','AWAITING_RESPONDENT_ACKNOWLEDGEMENT');
-    console.log('--defendantResponse--');
-    await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false,
-      false,'00000',true);
-    console.log('--claimantResponse--');
-    await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario,
-      'JUDICIAL_REFERRAL');
-    console.log('--sdo--');
-    await api_spec.createSDO(judgeUser, 'CREATE_FAST_NO_SUM');
-    console.log('--createFinalOrderJO--');
-    await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER');
-    console.log('--recordJudgment--');
-    await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY');
-    await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE');
-    console.log('--markJudgmentPaid--');
-    await api_spec.markJudgmentPaid(config.applicantSolicitorUser);
+    await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','All_FINAL_ORDERS_ISSUED');
   }
 });