diff --git a/ccd-definition/CaseTypeTab/DefaultJudgmentDetailsDJSpec-nonprod.json b/ccd-definition/CaseTypeTab/DefaultJudgmentDetailsDJSpec-nonprod.json
new file mode 100644
index 0000000000..d5c04aa5a4
--- /dev/null
+++ b/ccd-definition/CaseTypeTab/DefaultJudgmentDetailsDJSpec-nonprod.json
@@ -0,0 +1,74 @@
+[
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "defendantDetailsSpec",
+    "TabFieldDisplayOrder": 13,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "repaymentSummaryObject",
+    "TabFieldDisplayOrder": 14,
+    "FieldShowCondition": "defendantDetailsSpec = \"DO_NOT_SHOW_IN_UI\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "repaymentSummaryLabel",
+    "TabFieldDisplayOrder": 15,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "paymentTypeSelection",
+    "TabFieldDisplayOrder": 16,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "paymentSetDate",
+    "TabFieldDisplayOrder": 17,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "repaymentSuggestion",
+    "TabFieldDisplayOrder": 18,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "repaymentFrequency",
+    "TabFieldDisplayOrder": 19,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "JudgmentTab",
+    "TabLabel": "Judgment",
+    "TabDisplayOrder": 9,
+    "CaseFieldID": "repaymentDate",
+    "TabFieldDisplayOrder": 20,
+    "FieldShowCondition": "joIsLiveJudgmentExists= \"No\" AND joIsDisplayInJudgmentTab= \"Yes\""
+  }
+]
diff --git a/ccd-definition/CaseTypeTab/Judgments-JO-nonprod.json b/ccd-definition/CaseTypeTab/Judgments-JO-nonprod.json
index cb98dd94f5..82a02afe49 100644
--- a/ccd-definition/CaseTypeTab/Judgments-JO-nonprod.json
+++ b/ccd-definition/CaseTypeTab/Judgments-JO-nonprod.json
@@ -6,7 +6,8 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joIsLiveJudgmentExists",
     "TabFieldDisplayOrder": 1,
-    "FieldShowCondition": "joIsLiveJudgmentExists = \"DO_NOT_SHOW_IN_UI\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"DO_NOT_SHOW_IN_UI\"",
+    "TabShowCondition": "joIsLiveJudgmentExists = \"Yes\" OR (joIsLiveJudgmentExists = \"No\" AND paymentTypeSelection = \"*\" AND joIsDisplayInJudgmentTab= \"Yes\")"
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -15,8 +16,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joIsDisplayInJudgmentTab",
     "TabFieldDisplayOrder": 2,
-    "FieldShowCondition": "joIsLiveJudgmentExists = \"DO_NOT_SHOW_IN_UI\"",
-    "TabShowCondition": "joIsLiveJudgmentExists = \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"DO_NOT_SHOW_IN_UI\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -25,7 +25,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joDefendantName1",
     "TabFieldDisplayOrder": 3,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -34,7 +34,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joDefendantName2",
     "TabFieldDisplayOrder": 4,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -43,7 +43,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joRepaymentSummaryLabel",
     "TabFieldDisplayOrder": 5,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -61,7 +61,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joPaymentPlanSelected",
     "TabFieldDisplayOrder": 7,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -70,7 +70,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joRepaymentAmount",
     "TabFieldDisplayOrder": 8,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -79,7 +79,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joRepaymentFrequency",
     "TabFieldDisplayOrder": 9,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -88,7 +88,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joRepaymentStartDate",
     "TabFieldDisplayOrder": 10,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -97,7 +97,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joIssueDate",
     "TabFieldDisplayOrder": 11,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -106,7 +106,7 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joState",
     "TabFieldDisplayOrder": 12,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -115,6 +115,6 @@
     "TabDisplayOrder": 9,
     "CaseFieldID": "joFullyPaymentMadeDate",
     "TabFieldDisplayOrder": 13,
-    "FieldShowCondition": "joIsDisplayInJudgmentTab= \"Yes\""
+    "FieldShowCondition": "joIsLiveJudgmentExists = \"Yes\" AND joIsDisplayInJudgmentTab= \"Yes\""
   }
 ]