diff --git a/ibm_catalog.json b/ibm_catalog.json
index 79e8bf9..69e507c 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -273,36 +273,27 @@
             },
             {
               "key": "enable_platform_metrics",
-              "type": "string",
-              "default_value": "true",
+              "type": "boolean",
+              "default_value": false,
               "description": "When set to `true`, the IBM Cloud Monitoring instance will be configured to collect platform metrics from the provided region. You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another monitoring instance has already been configured. You may not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).",
               "required": true,
-              "virtual": true,
-              "options": [
-                {
-                  "displayname": "true",
-                  "value": "true"
-                },
-                {
-                  "displayname": "false",
-                  "value": "false"
-                }
-              ]
+              "virtual": true
             },
             {
               "key": "logs_routing_tenant_regions",
-              "type": "list(string)",
+              "type": "array",
               "default_value": "[]",
               "description": "To manage platform logs that are generated by IBM Cloud services in a region of IBM Cloud, you must create a tenant in each region that you operate. Pass a list of regions to create a tenant in. [Learn more](https://cloud.ibm.com/docs/logs-router?topic=logs-router-about-platform-logs).",
               "required": true,
-              "virtual": true,
               "custom_config": {
+                "type": "array",
                 "grouping": "deployment",
                 "original_grouping": "deployment",
                 "config_constraints": {
-                  "type": "string"
+                "type": "string"
                 }
-              }
+            },
+              "virtual": true
             },
             {
               "key": "existing_resource_group_name",
@@ -327,18 +318,34 @@
             },
             {
               "key": "enterprise_account_group_ids_to_assign",
-              "type": "list(string)",
-              "default_value": "[\"all\"]",
+              "type": "array",
+              "default_value": "[]",
               "description": "A list of enterprise account group IDs to assign the trusted profile template to in order for the accounts to be scanned. Supports passing the string 'all' in the list to assign to all account groups. Only applies if `cspm_enabled` is true and a value is being passed for `enterprise_id`.",
               "required": false,
+              "custom_config": {
+                  "type": "array",
+                  "grouping": "deployment",
+                  "original_grouping": "deployment",
+                  "config_constraints": {
+                      "type": "string"
+                    }
+                },
               "virtual": true
             },
             {
               "key": "enterprise_account_ids_to_assign",
-              "type": "list(string)",
-              "default_value": "[\"all\"]",
+              "type": "array",
+              "default_value": "[]",
               "description": "A list of enterprise account IDs to assign the trusted profile template to in order for the accounts to be scanned. Supports passing the string 'all' in the list to assign to all accounts. Only applies if `cspm_enabled` is true and a value is being passed for `enterprise_id`.",
               "required": false,
+              "custom_config": {
+                  "type": "array",
+                  "grouping": "deployment",
+                  "original_grouping": "deployment",
+                  "config_constraints": {
+                      "type": "string"
+                    }
+                },
               "virtual": true
             },
             {