diff --git a/src/main/resources/defaults/manifest.json b/src/main/resources/defaults/manifest.json
index c91fc950..36a48757 100644
--- a/src/main/resources/defaults/manifest.json
+++ b/src/main/resources/defaults/manifest.json
@@ -1,76 +1,89 @@
 {
-    "version": "v1",
-    "labels": {
-        "micrometer-prometheus": "enabled"
+  "version": "v1",
+  "labels": {
+    "micrometer-prometheus": "enabled"
+  },
+  "team": {
+    "name": "Infra"
+  },
+  "deployment": {
+    "timeout": 1500,
+    "instance": {
+      "cpu": 0.25,
+      "memory": "300Mi"
     },
-    "team": {
-        "name": "Infra"
+    "hpa": {
+      "minReplicas": 2,
+      "maxReplicas": 2
     },
-    "deployment": {
-        "timeout": 1500,
-        "instance": {
-            "cpu": 0.25,
-            "memory": "300Mi"
-        },
-        "hpa": {
-            "minReplicas": 2,
-            "maxReplicas": 2
-        },
-        "exposedPorts": [
-            {
-                "name": "serviceport",
-                "port": 8080
-            },
-            {
-                "name": "metrics",
-                "port": 4001
-            }
-        ],
-        "alerts": {
-            "http5xx": {
-                "thresholdPercent": "2",
-                "duration": "3m",
-                "severity": "critical"
-            },
-            "http4xx": {
-                "thresholdPercent": "15",
-                "duration": "3m",
-                "severity": "critical"
-            },
-            "elb4xx": {
-                "thresholdPercent": "1",
-                "duration": "3m",
-                "severity": "critical"
-            },
-            "elb5xx": {
-                "thresholdPercent": "1",
-                "duration": "3m",
-                "severity": "critical"
-            },
-            "latency": {
-                "thresholdPercent": "800",
-                "duration": "3m",
-                "severity": "warning"
-            }
-        },
-        "healthCheck": {
-            "livenessCheck": {
-                "type": "http",
-                "port": "metrics",
-                "successThreshold": 1,
-                "failureThreshold": 5,
-                "initialDelaySeconds": 60,
-                "periodSeconds": 30,
-                "path": "/actuator/health"
-            },
-            "readinessCheck": {
-                "type": "tcp",
-                "port": "serviceport",
-                "successThreshold": 1,
-                "failureThreshold": 5,
-                "initialDelaySeconds": 60,
-                "periodSeconds": 30
-            }
-        }
+    "exposedPorts": [
+      {
+        "name": "serviceport",
+        "port": 8080
+      },
+      {
+        "name": "metrics",
+        "port": 4001
+      }
+    ],
+    "alerts": {
+      "http5xx": {
+        "thresholdPercent": "2",
+        "duration": "3m",
+        "severity": "critical"
+      },
+      "http4xx": {
+        "thresholdPercent": "15",
+        "duration": "3m",
+        "severity": "critical"
+      },
+      "elb4xx": {
+        "thresholdPercent": "1",
+        "duration": "3m",
+        "severity": "critical"
+      },
+      "elb5xx": {
+        "thresholdPercent": "1",
+        "duration": "3m",
+        "severity": "critical"
+      },
+      "latency": {
+        "thresholdPercent": "800",
+        "duration": "3m",
+        "severity": "warning"
+      }
+    },
+    "healthCheck": {
+      "livenessCheck": {
+        "type": "http",
+        "port": "metrics",
+        "successThreshold": 1,
+        "failureThreshold": 5,
+        "initialDelaySeconds": 60,
+        "periodSeconds": 30,
+        "path": "/actuator/health"
+      },
+      "readinessCheck": {
+        "type": "tcp",
+        "port": "serviceport",
+        "successThreshold": 1,
+        "failureThreshold": 5,
+        "initialDelaySeconds": 60,
+        "periodSeconds": 30
+      }
     }
+  },
+  "extraResources": {
+    "rdsAlertThresholds": {
+      "cpuUtilization": 70,
+      "cpuCreditBalance": 120,
+      "burstBalance": 85,
+      "dbConnections": 200,
+      "queueDepth": 20,
+      "freeStorageSpacePercent": 90,
+      "freeMemoryTooLowInBytes": 150000000,
+      "readLatency": 0.5,
+      "writeLatency": 0.5
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/jsonschema/extraResources.json b/src/main/resources/jsonschema/extraResources.json
index 2d6d2c15..ef24bcdb 100644
--- a/src/main/resources/jsonschema/extraResources.json
+++ b/src/main/resources/jsonschema/extraResources.json
@@ -91,44 +91,35 @@
         }
       }
     },
-    "rds_alert_thresholds": {
+    "rdsAlertThresholds": {
       "type": "object",
       "properties": {
-        "cpu_utilization": {
-          "type": "integer",
-          "default": 75
+        "cpuUtilization": {
+          "type": "integer"
         },
-        "cpu_credit_balance": {
-          "type": "integer",
-          "default": 120
+        "cpuCreditBalance": {
+          "type": "integer"
         },
-        "burst_balance": {
-          "type": "integer",
-          "default": 80
+        "burstBalance": {
+          "type": "integer"
         },
-        "db_connections": {
-          "type": "integer",
-          "default": 200
+        "dbConnections": {
+          "type": "integer"
         },
-        "queue_depth": {
-          "type": "integer",
-          "default": 20
+        "queueDepth": {
+          "type": "integer"
         },
-        "free_storage_space": {
-          "type": "integer",
-          "default": 90
+        "freeStorageSpacePercent": {
+          "type": "integer"
         },
-        "read_latency": {
-          "type": "number",
-          "default": 0.5
+        "readLatency": {
+          "type": "number"
         },
-        "write_latency": {
-          "type": "number",
-          "default": 0.5
+        "writeLatency": {
+          "type": "number"
         },
-        "freeable_memory_too_low": {
-          "type": "integer",
-          "default": 150000000
+        "freeMemoryTooLowInBytes": {
+          "type": "integer"
         }
       }
     }
diff --git a/src/main/resources/uischema/extraResources.json b/src/main/resources/uischema/extraResources.json
index e94e5c78..5ef4d31f 100644
--- a/src/main/resources/uischema/extraResources.json
+++ b/src/main/resources/uischema/extraResources.json
@@ -77,52 +77,52 @@
       "id": "rdsAlertThresholds",
       "parentId": "extraResources",
       "label": "RDS Alert Thresholds",
-      "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties",
+      "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties",
       "elements": [
         {
           "type": "Control",
           "label": "CPU Utilization",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/cpu_utilization"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/cpuUtilization"
         },
         {
           "type": "Control",
           "label": "CPU Credit Balance",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/cpu_credit_balance"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/cpuCreditBalance"
         },
         {
           "type": "Control",
           "label": "Burst Balance",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/burst_balance"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/burstBalance"
         },
         {
           "type": "Control",
           "label": "DB Connections",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/db_connections"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/dbConnections"
         },
         {
           "type": "Control",
           "label": "Queue Depth",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/queue_depth"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/queueDepth"
         },
         {
           "type": "Control",
           "label": "Free Storage Space",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/free_storage_space"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/freeStorageSpacePercent"
         },
         {
           "type": "Control",
           "label": "Read Latency",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/read_latency"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/readLatency"
         },
         {
           "type": "Control",
           "label": "Write Latency",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/write_latency"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/writeLatency"
         },
         {
           "type": "Control",
           "label": "Freeable Memory Too Low",
-          "scope": "#/properties/extraResources/properties/rds_alert_thresholds/properties/freeable_memory_too_low"
+          "scope": "#/properties/extraResources/properties/rdsAlertThresholds/properties/freeMemoryTooLowInBytes"
         }
       ]
     }