diff --git a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
index bf33d36bc8..a21f9e5363 100644
--- a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
+++ b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
@@ -34,6 +34,7 @@
     "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted",
     "RetriesTimeoutAboutToStartEvent": 0,
     "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "Publish": "Y",
     "EventEnablingCondition": "joIsLiveJudgmentExists = \"Yes\" AND CaseAccessCategory=\"SPEC_CLAIM\" AND activeJudgment.type = \"DEFAULT_JUDGMENT\""
   },
   {
diff --git a/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-JO-nonprod.json b/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-JO-nonprod.json
new file mode 100644
index 0000000000..ab160fb7ed
--- /dev/null
+++ b/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-JO-nonprod.json
@@ -0,0 +1,14 @@
+[
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "SET_ASIDE_JUDGMENT",
+    "CaseFieldID": "featureToggleWA",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageShowCondition": "joSetAsideReason=\"DO NOT SHOW IN UI\"",
+    "ShowSummaryChangeOption": "N",
+    "Publish": "Y"
+  }
+]
diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml
index a001001813..3794f7ef1c 100644
--- a/charts/civil-ccd/values.preview.template.yaml
+++ b/charts/civil-ccd/values.preview.template.yaml
@@ -3,7 +3,7 @@ civil-wa:
 
 civil-service:
   java:
-    image: 'hmctspublic.azurecr.io/civil/service:latest'
+    image: 'hmctspublic.azurecr.io/civil/service:pr-5351'
     keyVaults:
       civil:
         resourceGroup: civil
@@ -53,6 +53,7 @@ civil-service:
           - name: hmc-servicebus-shared-access-key-tf
             alias: HMC_HEARINGS_TOPIC_ACCESS_KEY
     environment:
+      WA_TOGGLE: JO
       LAUNCH_DARKLY_ENV: ${SERVICE_FQDN}
       OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat2.internal:8443/openam/oauth2/realms/root/realms/hmcts
       SERVICE_REQUEST_UPDATE: https://${SERVICE_NAME}.preview.platform.hmcts.net/service-request-update
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 24165f9c7a..f7faad2da1 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
@@ -35,7 +35,7 @@ Scenario('SetAside Default Judgment after judgment error - Spec claim 1v1 - Case
     await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false);
     console.log('--setAsideJudgment--');
     console.log(` user : ${caseWorkerUser.email} : config.testEarlyAdopterCourts : ${config.testEarlyAdopterCourts}`);
-    await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGMENT_ERROR','ORDER_AFTER_DEFENCE','PROCEEDS_IN_HERITAGE_SYSTEM');
+    await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGMENT_ERROR','ORDER_AFTER_DEFENCE','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 dd8d9f0bf3..0b34ec2231 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
@@ -56,7 +56,7 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside after defence - Case taken
     await api_spec.amendRespondent1ResponseDeadline(config.systemupdate);
     await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false);
     console.log('--setAsideJudgment--');
-    await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGE_ORDER', 'ORDER_AFTER_DEFENCE', 'PROCEEDS_IN_HERITAGE_SYSTEM');
+    await api_spec.setAsideJudgment(config.hearingCenterAdminWithRegionId2, 'JUDGE_ORDER', 'ORDER_AFTER_DEFENCE', 'All_FINAL_ORDERS_ISSUED');
   }
 });