diff --git a/common-dev-assets b/common-dev-assets
index 238892d..6cbdb24 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 238892dddce116998ab6b6ebdb998708401174d1
+Subproject commit 6cbdb2424718173196193a314400ddbf8a536e65
diff --git a/ibm_catalog.json b/ibm_catalog.json
index 86ce671..a1b77b8 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -32,6 +32,7 @@
         {
           "label": "Fully configurable",
           "name": "fully-configurable",
+          "short_description": "Ideal for users who want flexibility with a reliable starting point.",
           "index": 1,
           "working_directory": "solutions/fully-configurable",
           "iam_permissions": [
@@ -447,7 +448,18 @@
               "key": "add_cluster_name"
             },
             {
-              "key": "agent_tags"
+              "key": "agent_tags",
+              "type": "object",
+              "custom_config": {
+                "type": "code_editor",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
+              }
             },
             {
               "key": "deployment_tag"
@@ -469,7 +481,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -501,7 +518,17 @@
             {
               "key": "node_selector",
               "type": "object",
-              "default_value": {}
+              "default_value": {},
+              "custom_config": {
+                "type": "code_editor",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
+              }
             },
             {
               "key": "tolerations",
@@ -509,7 +536,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -528,7 +560,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -537,7 +574,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {