diff --git a/ibm_catalog.json b/ibm_catalog.json
index 5a9f211..8f6db24 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -254,7 +254,12 @@
               "key": "member_host_flavor"
             },
             {
-              "key": "auto_scaling"
+              "key": "auto_scaling",
+              "custom_config": {
+                "type": "code_editor",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
               "key": "configuration",
@@ -597,7 +602,12 @@
               "key": "member_host_flavor"
             },
             {
-              "key": "auto_scaling"
+              "key": "auto_scaling",
+              "custom_config": {
+                "type": "code_editor",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
               "key": "configuration",
diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf
index 3e63497..34b32a7 100644
--- a/solutions/fully-configurable/variables.tf
+++ b/solutions/fully-configurable/variables.tf
@@ -323,7 +323,28 @@ variable "auto_scaling" {
     })
   })
   description = "Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/blob/main/solutions/standard/DA-types.md#autoscaling)"
-  default     = null
+  default = {
+    disk = {
+      capacity_enabled             = false
+      free_space_less_than_percent = 10
+      io_above_percent             = 90
+      io_enabled                   = false
+      io_over_period               = "15m"
+      rate_increase_percent        = 10
+      rate_limit_mb_per_member     = 3670016
+      rate_period_seconds          = 900
+      rate_units                   = "mb"
+    }
+    memory = {
+      io_above_percent         = 90
+      io_enabled               = false
+      io_over_period           = "15m"
+      rate_increase_percent    = 10
+      rate_limit_mb_per_member = 114688
+      rate_period_seconds      = 900
+      rate_units               = "mb"
+    }
+  }
 }
 
 ##############################################################################
diff --git a/solutions/security-enforced/variables.tf b/solutions/security-enforced/variables.tf
index dd82b54..0a60814 100644
--- a/solutions/security-enforced/variables.tf
+++ b/solutions/security-enforced/variables.tf
@@ -257,7 +257,28 @@ variable "auto_scaling" {
     })
   })
   description = "Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/blob/main/solutions/standard/DA-types.md#autoscaling)"
-  default     = null
+  default = {
+    disk = {
+      capacity_enabled             = false
+      free_space_less_than_percent = 10
+      io_above_percent             = 90
+      io_enabled                   = false
+      io_over_period               = "15m"
+      rate_increase_percent        = 10
+      rate_limit_mb_per_member     = 3670016
+      rate_period_seconds          = 900
+      rate_units                   = "mb"
+    }
+    memory = {
+      io_above_percent         = 90
+      io_enabled               = false
+      io_over_period           = "15m"
+      rate_increase_percent    = 10
+      rate_limit_mb_per_member = 114688
+      rate_period_seconds      = 900
+      rate_units               = "mb"
+    }
+  }
 }
 
 #############################################################################