diff --git a/README.md b/README.md
index e8298710..ef43ddb4 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ No resources.
 | <a name="output_binding"></a> [binding](#output\_binding) | Configuration of the created code engine binding. |
 | <a name="output_build"></a> [build](#output\_build) | Configuration of the created code engine build. |
 | <a name="output_config_map"></a> [config\_map](#output\_config\_map) | Configuration of the created code engine config map. |
-| <a name="output_domain_mapping"></a> [domain\_mapping](#output\_domain\_mapping) | Configuration of the created code engine domain maping. |
+| <a name="output_domain_mapping"></a> [domain\_mapping](#output\_domain\_mapping) | Configuration of the created code engine domain mapping. |
 | <a name="output_job"></a> [job](#output\_job) | Configuration of the created code engine job. |
 | <a name="output_project_id"></a> [project\_id](#output\_project\_id) | ID of the created code engine project. |
 | <a name="output_secret"></a> [secret](#output\_secret) | Configuration of the created code engine secret. |
diff --git a/examples/apps/outputs.tf b/examples/apps/outputs.tf
index a0a75dca..73254724 100644
--- a/examples/apps/outputs.tf
+++ b/examples/apps/outputs.tf
@@ -23,6 +23,6 @@ output "secret" {
 }
 
 output "domain_mapping" {
-  description = "Configuration of the created code engine domain maping."
+  description = "Configuration of the created code engine domain mapping."
   value       = module.code_engine.domain_mapping
 }
diff --git a/ibm_catalog.json b/ibm_catalog.json
index 604a97d8..a360c801 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -145,7 +145,14 @@
             },
             {
               "key": "prefix",
-              "required": true
+              "required": true,
+              "value_constraints": [
+                {
+                  "type": "regex",
+                  "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.",
+                  "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
+                }
+              ]
             },
             {
               "key": "existing_resource_group_name",
@@ -243,7 +250,14 @@
               "key": "image_port"
             },
             {
-              "key": "managed_domain_mappings"
+              "key": "managed_domain_mappings",
+              "value_constraints": [
+                {
+                  "type": "regex",
+                  "description": "The value provided for 'managed_domain_mappings' is not valid. Valid values are 'local_public', 'local_private', or 'local'.",
+                  "value": "^__NULL__$|^local_public$|^local_private$|^local$"
+                }
+              ]
             },
             {
               "key": "run_arguments"
@@ -379,7 +393,14 @@
             },
             {
               "key": "prefix",
-              "required": true
+              "required": true,
+              "value_constraints": [
+                {
+                  "type": "regex",
+                  "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.",
+                  "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
+                }
+              ]
             },
             {
               "key": "existing_resource_group_name",
diff --git a/outputs.tf b/outputs.tf
index 886c0a39..0f3f8e83 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -38,6 +38,6 @@ output "binding" {
 }
 
 output "domain_mapping" {
-  description = "Configuration of the created code engine domain maping."
+  description = "Configuration of the created code engine domain mapping."
   value       = module.domain_mapping
 }
diff --git a/solutions/apps/outputs.tf b/solutions/apps/outputs.tf
index 6bb70259..2ccaa978 100644
--- a/solutions/apps/outputs.tf
+++ b/solutions/apps/outputs.tf
@@ -23,7 +23,7 @@ output "secret" {
 }
 
 output "domain_mapping" {
-  description = "Configuration of the created code engine domain maping."
+  description = "Configuration of the created code engine domain mapping."
   value       = module.code_engine.domain_mapping
 }
 
diff --git a/solutions/apps/variables.tf b/solutions/apps/variables.tf
index d2dc3c7a..8782f7df 100644
--- a/solutions/apps/variables.tf
+++ b/solutions/apps/variables.tf
@@ -28,7 +28,7 @@ variable "region" {
 variable "prefix" {
   type        = string
   nullable    = true
-  description = "The prefix to be added to all resources created by this solution. To skip using a prefix, set this value to null or an empty string. The prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It should not exceed 16 characters, must not end with a hyphen('-'), and can not contain consecutive hyphens ('--'). Example: prod-0205-cos. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/prefix.md)."
+  description = "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). To skip using a prefix, set this value to null or an empty string. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/prefix.md)."
 
   validation {
     # - null and empty string is allowed
diff --git a/solutions/project/outputs.tf b/solutions/project/outputs.tf
index 467f5778..b8e652d7 100644
--- a/solutions/project/outputs.tf
+++ b/solutions/project/outputs.tf
@@ -23,7 +23,7 @@ output "secret" {
 }
 
 output "domain_mapping" {
-  description = "Configuration of the created code engine domain maping."
+  description = "Configuration of the created code engine domain mapping."
   value       = module.domain_mapping
 }
 
diff --git a/solutions/project/variables.tf b/solutions/project/variables.tf
index 464a861c..6a690e18 100644
--- a/solutions/project/variables.tf
+++ b/solutions/project/variables.tf
@@ -22,7 +22,7 @@ variable "provider_visibility" {
 variable "prefix" {
   type        = string
   nullable    = true
-  description = "The prefix to be added to all resources created by this solution. To skip using a prefix, set this value to null or an empty string. The prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It should not exceed 16 characters, must not end with a hyphen('-'), and can not contain consecutive hyphens ('--'). Example: prod-0205-cos. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/prefix.md)."
+  description = "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). To skip using a prefix, set this value to null or an empty string. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/prefix.md)."
 
   validation {
     # - null and empty string is allowed