diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 44a5febf8..a184b8a39 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1677,12 +1677,10 @@
         if (name == this.$t('designComplianceProcess')) {
           if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') {
             TaskKey = 'zrrqr'
-          } else if (row.designFlowStatus == 'Results to be submitted') {
+          } else if (row.designFlowStatus == 'Results to be submitted' || row.designFlowStatus == 'Non-Compliance' || row.designFlowStatus == 'To be tracked') {
             TaskKey = 'zrrtjjfw'
           } else if (row.designFlowStatus == 'Results to be reviewed' ||
             row.designFlowStatus == 'Compliance' ||
-            row.designFlowStatus == 'Non-Compliance' ||
-            row.designFlowStatus == 'To be tracked' ||
             row.designFlowStatus == 'NA') {
             TaskKey = 'fggcssh'
           }
@@ -1707,12 +1705,10 @@
         } else {
           if (row.verifyFlowStatus == 'Task to be confirmed' || row.verifyFlowStatus == 'Duty Person Rejected') {
             TaskKey = 'zrrqr'
-          } else if (row.verifyFlowStatus == 'Results to be submitted') {
+          } else if (row.verifyFlowStatus == 'Results to be submitted' || row.verifyFlowStatus == 'Non-Compliance' || row.verifyFlowStatus == 'To be tracked') {
             TaskKey = 'zrrtjjfw'
           } else if (row.verifyFlowStatus == 'Results to be reviewed' ||
             row.verifyFlowStatus == 'Compliance' ||
-            row.verifyFlowStatus == 'Non-Compliance' ||
-            row.verifyFlowStatus == 'To be tracked' ||
             row.verifyFlowStatus == 'NA') {
             TaskKey = 'fggcssh'
           }
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 2dc2e0f90..46b5b74a5 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -296,12 +296,10 @@
         if (row.flowType == '2') {
           if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
             TaskKey = 'zrrqr'
-          } else if (row.flowStatus == 'Results to be submitted') {
+          } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
             TaskKey = 'zrrtjjfw'
           } else if (row.flowStatus == 'Results to be reviewed' ||
             row.flowStatus == 'Compliance' ||
-            row.flowStatus == 'Non-Compliance' ||
-            row.flowStatus == 'To be tracked' ||
             row.flowStatus == 'NA') {
             TaskKey = 'fggcssh'
           }
@@ -322,12 +320,10 @@
         } else if(row.flowType == '4'){
           if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
             TaskKey = 'zrrqr'
-          } else if (row.flowStatus == 'Results to be submitted') {
+          } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
             TaskKey = 'zrrtjjfw'
           } else if (row.flowStatus == 'Results to be reviewed' ||
             row.flowStatus == 'Compliance' ||
-            row.flowStatus == 'Non-Compliance' ||
-            row.flowStatus == 'To be tracked' ||
             row.flowStatus == 'NA') {
             TaskKey = 'fggcssh'
           }
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 6ffd07a67..26225f031 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -408,12 +408,10 @@
         if (row.prcType == '2') {
           if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
             TaskKey = 'zrrqr'
-          } else if (row.flowStatus == 'Results to be submitted') {
+          } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' || row.flowStatus == 'To be tracked') {
             TaskKey = 'zrrtjjfw'
           } else if (row.flowStatus == 'Results to be reviewed' ||
             row.flowStatus == 'Compliance' ||
-            row.flowStatus == 'Non-Compliance' ||
-            row.flowStatus == 'To be tracked' ||
             row.flowStatus == 'NA') {
             TaskKey = 'fggcssh'
           }
@@ -435,12 +433,10 @@
         } else if(row.prcType == '4'){
           if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
             TaskKey = 'zrrqr'
-          } else if (row.flowStatus == 'Results to be submitted') {
+          } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' || row.flowStatus == 'To be tracked') {
             TaskKey = 'zrrtjjfw'
           } else if (row.flowStatus == 'Results to be reviewed' ||
             row.flowStatus == 'Compliance' ||
-            row.flowStatus == 'Non-Compliance' ||
-            row.flowStatus == 'To be tracked' ||
             row.flowStatus == 'NA') {
             TaskKey = 'fggcssh'
           }