diff --git a/charts/psc-autoscaler/crds/clusterautomationconfig.yaml b/charts/psc-autoscaler/crds/clusterautomationconfig.yaml
index 307f94c..022f949 100644
--- a/charts/psc-autoscaler/crds/clusterautomationconfig.yaml
+++ b/charts/psc-autoscaler/crds/clusterautomationconfig.yaml
@@ -29,9 +29,12 @@ spec:
         - name: StopAllAutomation
           type: boolean
           jsonPath: .spec.automation.operational.stopAllAutomation
-        - name: MaxAutomationFrequency
+        - name: WasteMaxAutomationFrequency
           type: string
-          jsonPath: .spec.automation.operational.timeConstraints.maxAutomationFrequency
+          jsonPath: .spec.automation.operational.timeConstraints.wasteMaxAutomationFrequency
+        - name: FixResiliencyMaxAutomationFrequency
+          type: string
+          jsonPath: .spec.automation.operational.timeConstraints.fixResiliencyMaxAutomationFrequency
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
@@ -74,6 +77,10 @@ spec:
                           properties:
                             maxAutomationFrequency:
                               type: string
+                            wasteMaxAutomationFrequency:
+                              type: string
+                            fixResiliencyMaxAutomationFrequency:
+                              type: string
                             maintenanceWindow:
                               type: object
                               x-kubernetes-preserve-unknown-fields: true
@@ -240,6 +247,10 @@ spec:
                                 properties:
                                   maxAutomationFrequency:
                                     type: string
+                                  wasteMaxAutomationFrequency:
+                                    type: string
+                                  fixResiliencyMaxAutomationFrequency:
+                                    type: string
                                   maintenanceWindow:
                                     type: object
                                     x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/psc-autoscaler/crds/namespaceautomationconfig.yaml b/charts/psc-autoscaler/crds/namespaceautomationconfig.yaml
index 3e0775f..13b1149 100644
--- a/charts/psc-autoscaler/crds/namespaceautomationconfig.yaml
+++ b/charts/psc-autoscaler/crds/namespaceautomationconfig.yaml
@@ -29,9 +29,12 @@ spec:
         - name: AutomationMode
           type: string
           jsonPath: .spec.automation.operational.automationMode
-        - name: MaxAutomationFrequency
+        - name: WasteMaxAutomationFrequency
           type: string
-          jsonPath: .spec.automation.operational.timeConstraints.maxAutomationFrequency
+          jsonPath: .spec.automation.operational.timeConstraints.wasteMaxAutomationFrequency
+        - name: FixResiliencyMaxAutomationFrequency
+          type: string
+          jsonPath: .spec.automation.operational.timeConstraints.fixResiliencyMaxAutomationFrequency
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
@@ -72,6 +75,10 @@ spec:
                           properties:
                             maxAutomationFrequency:
                               type: string
+                            wasteMaxAutomationFrequency:
+                              type: string
+                            fixResiliencyMaxAutomationFrequency:
+                              type: string
                             maintenanceWindow:
                               type: object
                               x-kubernetes-preserve-unknown-fields: true
@@ -238,6 +245,10 @@ spec:
                                 properties:
                                   maxAutomationFrequency:
                                     type: string
+                                  wasteMaxAutomationFrequency:
+                                    type: string
+                                  fixResiliencyMaxAutomationFrequency:
+                                    type: string
                                   maintenanceWindow:
                                     type: object
                                     x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/psc-autoscaler/crds/workloadautomationconfig.yaml b/charts/psc-autoscaler/crds/workloadautomationconfig.yaml
index 6200ac3..d0c7a7a 100644
--- a/charts/psc-autoscaler/crds/workloadautomationconfig.yaml
+++ b/charts/psc-autoscaler/crds/workloadautomationconfig.yaml
@@ -29,9 +29,12 @@ spec:
         - name: AutomationMode
           type: string
           jsonPath: .spec.automation.operational.automationMode
-        - name: MaxAutomationFrequency
+        - name: WasteMaxAutomationFrequency
           type: string
-          jsonPath: .spec.automation.operational.timeConstraints.maxAutomationFrequency
+          jsonPath: .spec.automation.operational.timeConstraints.wasteMaxAutomationFrequency
+        - name: FixResiliencyMaxAutomationFrequency
+          type: string
+          jsonPath: .spec.automation.operational.timeConstraints.fixResiliencyMaxAutomationFrequency
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
@@ -73,6 +76,10 @@ spec:
                           properties:
                             maxAutomationFrequency:
                               type: string
+                            wasteMaxAutomationFrequency:
+                              type: string
+                            fixResiliencyMaxAutomationFrequency:
+                              type: string
                             maintenanceWindow:
                               type: object
                               x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/psc-autoscaler/crds/workloadautomationstatus.yaml b/charts/psc-autoscaler/crds/workloadautomationstatus.yaml
index 0f5226f..f6e083c 100644
--- a/charts/psc-autoscaler/crds/workloadautomationstatus.yaml
+++ b/charts/psc-autoscaler/crds/workloadautomationstatus.yaml
@@ -58,6 +58,14 @@ spec:
                       type: string
                     name:
                       type: string
+                customGrouping:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                  properties:
+                    isLabelBased:
+                      type: boolean
+                    isSpecHonored:
+                      type: boolean
             status:
               type: object
               x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/psc-autoscaler/examples/namespace-config-override.yaml b/charts/psc-autoscaler/examples/namespace-config-override.yaml
index d938d75..ef28eeb 100644
--- a/charts/psc-autoscaler/examples/namespace-config-override.yaml
+++ b/charts/psc-autoscaler/examples/namespace-config-override.yaml
@@ -9,7 +9,8 @@ spec:
         operational:
           automationMode: "Enabled"
           timeConstraints:
-            maxAutomationFrequency: "15m"
+            wasteMaxAutomationFrequency: "1h"
+            fixResiliencyMaxAutomationFrequency: "15m"
             maintenanceWindow:
               monday:
                 - "10:00-18:00"
diff --git a/charts/psc-autoscaler/examples/workload-config-override.yaml b/charts/psc-autoscaler/examples/workload-config-override.yaml
index 860fd18..40a0aa4 100644
--- a/charts/psc-autoscaler/examples/workload-config-override.yaml
+++ b/charts/psc-autoscaler/examples/workload-config-override.yaml
@@ -10,7 +10,8 @@ spec:
     operational:
       automationMode: "Enabled"
       timeConstraints:
-        maxAutomationFrequency: "15m"
+        wasteMaxAutomationFrequency: "1h"
+        fixResiliencyMaxAutomationFrequency: "15m"
         maintenanceWindow:
           monday:
             - "10:00-18:00"
diff --git a/charts/psc-autoscaler/values.yaml b/charts/psc-autoscaler/values.yaml
index f9a3a8f..79d5012 100644
--- a/charts/psc-autoscaler/values.yaml
+++ b/charts/psc-autoscaler/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 3
 image:
   repository: public.ecr.aws/perfectscale-io/psc-autoscaler
   pullPolicy: Always
-  tag: "v1.0.15"
+  tag: "v1.0.16"
 settings:
   port: 8443
   env: "prod"