diff --git a/ibm_catalog.json b/ibm_catalog.json
index 5ca7deab..fb8947eb 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -66,7 +66,7 @@
           "label": "Basic with sample application (Deploy on Code Engine)",
           "name": "basic",
           "index": 2,
-          "short_description": "Provides Code Engine users with serverless simplicity plus a hosted sample app and CI/CD pipeline.",
+          "short_description": "Ideal for Code Engine users seeking serverless simplicity with a hosted sample app and CI/CD pipeline.",
           "working_directory": "solutions/basic",
           "ignore_readme": true,
           "dependency_version_2": true,
@@ -230,7 +230,7 @@
               "key": "prefix",
               "type": "string",
               "default_value": "dev",
-              "random_string" : {
+              "random_string": {
                 "length": 4
               },
               "description": "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). Used to avoid name clashes in the target account when deploying this solution multiple times.",
@@ -339,7 +339,7 @@
               "key": "key_protect_plan",
               "type": "string",
               "default_value": "tiered-pricing",
-              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_kms_instance_crn`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
+              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_key_protect_instance`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
               "required": false,
               "options": [
                 {
@@ -395,7 +395,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -489,66 +494,165 @@
             },
             {
               "key": "existing_secrets_manager_crn",
+              "display_name": "existing_secrets_manager",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
-              "required": false
+              "description": "An existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "secrets-manager",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_kms_instance_crn",
+              "display_name": "existing_key_protect_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing KMS instance to use in this solution. If not set, a new KP instance is provisioned.",
-              "required": false
+              "description": "An existing Key Protect instance to use in this solution. If not set, a new instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "kms",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_event_notifications_instance_crn",
+              "display_name": "existing_event_notifications_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing event notification instance to use in this solution. If not set, a new event notification instance is provisioned.",
-              "required": false
+              "description": "An existing Event Notifications instance to use in this solution. If not set, a new event notification instance is provisioned.",
+              "required": false,
+                "custom_config": {
+                  "type": "platform_resource",
+                  "grouping": "deployment",
+                  "original_grouping": "deployment",
+                  "config_constraints": {
+                    "resourceType": "event-notifications",
+                    "selection": "single_select",
+                    "valueType": "crn"
+                  }
+                }
             },
             {
               "key": "existing_discovery_instance_crn",
+              "display_name": "existing_watson_discovery_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS discovery instance to use in this solution. If not set, a new discovery instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing Watson Discovery instance to use in this solution. If not set, a new Discovery instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "discovery",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_assistant_instance_crn",
+              "display_name": "existing_watsonx_assistant_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS assistant instance to use in this solution. If not set, a new assistant instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx Assistant instance to use in this solution. If not set, a new Assistant instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "conversation",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_governance_instance_crn",
+              "display_name": "existing_watsonx_governance_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS governance instance to use in this solution. If not set, a new governance instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.governance instance to use in this solution. If not set, a new watsonx.governance instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "aiopenscale",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_studio_instance_crn",
+              "display_name": "existing_watsonx_ai_studio_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS studio instance to use in this solution. If not set, a new studio instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Studio instance to use in this solution. If not set, a new watsonx.ai Studio instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "data-science-experience",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_machine_learning_instance",
+              "display_name": "existing_watsonx_ai_runtime_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS machine learning instance to use in this solution. If not set, a new machine learning instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Runtime instance to use in this solution. If not set, a new watsonx.ai Runtime instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "pm-20",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_elasticsearch_instance_crn",
+              "display_name": "existing_elasticsearch_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
-              "required": false
+              "description": "An existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "databases-for-elasticsearch",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             }
           ],
           "outputs": [
@@ -603,7 +707,7 @@
           "label": "Standard with sample application (Deploy on Red Hat OpenShift)",
           "name": "standard",
           "index": 3,
-          "short_description": "Offers Red Hat OpenShift users enterprise-grade flexibility along with a hosted sample app and automated pipeline deployment.",
+          "short_description": "Ideal for Red Hat OpenShift users requiring enterprise-grade flexibility with a hosted sample app and automated pipeline deployment.",
           "working_directory": "solutions/standard",
           "ignore_readme": true,
           "dependency_version_2": true,
@@ -719,7 +823,7 @@
                 "description": "Enables:"
               },
               {
-                "title": "1. Red Hat OpenShift cluster for microservices workloads",
+                "title": "1. Red Hat OpenShift cluster configured with logging and monitoring agents for microservice workloads",
                 "description": " "
               },
               {
@@ -781,7 +885,7 @@
               "key": "prefix",
               "type": "string",
               "default_value": "dev",
-              "random_string" : {
+              "random_string": {
                 "length": 4
               },
               "description": "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). Used to avoid name clashes in the target account when deploying this solution multiple times.",
@@ -890,7 +994,7 @@
               "key": "key_protect_plan",
               "type": "string",
               "default_value": "tiered-pricing",
-              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_kms_instance_crn`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
+              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_key_protect_instance`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
               "required": false,
               "options": [
                 {
@@ -946,7 +1050,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -1079,66 +1188,165 @@
             },
             {
               "key": "existing_secrets_manager_crn",
+              "display_name": "existing_secrets_manager",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
-              "required": false
+              "description": "An existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "secrets-manager",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_kms_instance_crn",
+              "display_name": "existing_key_protect_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing KMS instance to use in this solution. If not set, a new KP instance is provisioned.",
-              "required": false
+              "description": "An existing Key Protect instance to use in this solution. If not set, a new instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "kms",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_event_notifications_instance_crn",
+              "display_name": "existing_event_notifications_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing event notification instance to use in this solution. If not set, a new event notification instance is provisioned.",
-              "required": false
+              "description": "An existing Event Notifications instance to use in this solution. If not set, a new event notification instance is provisioned.",
+              "required": false,
+                "custom_config": {
+                  "type": "platform_resource",
+                  "grouping": "deployment",
+                  "original_grouping": "deployment",
+                  "config_constraints": {
+                    "resourceType": "event-notifications",
+                    "selection": "single_select",
+                    "valueType": "crn"
+                  }
+                }
             },
-            {
+           {
               "key": "existing_discovery_instance_crn",
+              "display_name": "existing_watson_discovery_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS discovery instance to use in this solution. If not set, a new discovery instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing Watson Discovery instance to use in this solution. If not set, a new Discovery instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "discovery",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_assistant_instance_crn",
+              "display_name": "existing_watsonx_assistant_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS assistant instance to use in this solution. If not set, a new assistant instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx Assistant instance to use in this solution. If not set, a new Assistant instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "conversation",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_governance_instance_crn",
+              "display_name": "existing_watsonx_governance_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS governance instance to use in this solution. If not set, a new governance instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.governance instance to use in this solution. If not set, a new watsonx.governance instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "aiopenscale",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_studio_instance_crn",
+              "display_name": "existing_watsonx_ai_studio_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS studio instance to use in this solution. If not set, a new studio instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Studio instance to use in this solution. If not set, a new watsonx.ai Studio instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "data-science-experience",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_machine_learning_instance",
+              "display_name": "existing_watsonx_ai_runtime_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS machine learning instance to use in this solution. If not set, a new machine learning instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Runtime instance to use in this solution. If not set, a new watsonx.ai Runtime instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "pm-20",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_elasticsearch_instance_crn",
+              "display_name": "existing_elasticsearch_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
-              "required": false
+              "description": "An existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "databases-for-elasticsearch",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             }
           ],
           "outputs": [
@@ -1341,7 +1549,7 @@
           "label": "Basic (Deploy on Code Engine)",
           "name": "basic-without-app",
           "index": 4,
-          "short_description": "Designed for Code Engine users who want serverless simplicity without deploying a sample app or pipeline.",
+          "short_description": "Ideal for Code Engine users seeking serverless simplicity without deploying a sample app or pipeline.",
           "working_directory": "solutions/basic-without-sample-app",
           "ignore_readme": true,
           "dependency_version_2": true,
@@ -1501,7 +1709,7 @@
               "key": "prefix",
               "type": "string",
               "default_value": "dev",
-              "random_string" : {
+              "random_string": {
                 "length": 4
               },
               "description": "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). Used to avoid name clashes in the target account when deploying this solution multiple times.",
@@ -1602,7 +1810,7 @@
               "key": "key_protect_plan",
               "type": "string",
               "default_value": "tiered-pricing",
-              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_kms_instance_crn`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
+              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_key_protect_instance`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
               "required": false,
               "options": [
                 {
@@ -1658,7 +1866,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -1745,66 +1958,165 @@
             },
             {
               "key": "existing_secrets_manager_crn",
+              "display_name": "existing_secrets_manager",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
-              "required": false
+              "description": "An existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "secrets-manager",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_kms_instance_crn",
+              "display_name": "existing_key_protect_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing KMS instance to use in this solution. If not set, a new KP instance is provisioned.",
-              "required": false
+              "description": "An existing Key Protect instance to use in this solution. If not set, a new instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "kms",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_event_notifications_instance_crn",
+              "display_name": "existing_event_notifications_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing event notification instance to use in this solution. If not set, a new event notification instance is provisioned.",
-              "required": false
+              "description": "An existing Event Notifications instance to use in this solution. If not set, a new event notification instance is provisioned.",
+              "required": false,
+                "custom_config": {
+                  "type": "platform_resource",
+                  "grouping": "deployment",
+                  "original_grouping": "deployment",
+                  "config_constraints": {
+                    "resourceType": "event-notifications",
+                    "selection": "single_select",
+                    "valueType": "crn"
+                  }
+                }
             },
             {
               "key": "existing_discovery_instance_crn",
+              "display_name": "existing_watson_discovery_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS discovery instance to use in this solution. If not set, a new discovery instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing Watson Discovery instance to use in this solution. If not set, a new Discovery instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "discovery",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_assistant_instance_crn",
+              "display_name": "existing_watsonx_assistant_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS assistant instance to use in this solution. If not set, a new assistant instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx Assistant instance to use in this solution. If not set, a new Assistant instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "conversation",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_governance_instance_crn",
+              "display_name": "existing_watsonx_governance_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS governance instance to use in this solution. If not set, a new governance instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.governance instance to use in this solution. If not set, a new watsonx.governance instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "aiopenscale",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_studio_instance_crn",
+              "display_name": "existing_watsonx_ai_studio_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS studio instance to use in this solution. If not set, a new studio instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Studio instance to use in this solution. If not set, a new watsonx.ai Studio instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "data-science-experience",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_machine_learning_instance",
+              "display_name": "existing_watsonx_ai_runtime_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS machine learning instance to use in this solution. If not set, a new machine learning instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Runtime instance to use in this solution. If not set, a new watsonx.ai Runtime instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "pm-20",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_elasticsearch_instance_crn",
+              "display_name": "existing_elasticsearch_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
-              "required": false
+              "description": "An existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "databases-for-elasticsearch",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             }
           ],
           "outputs": [
@@ -2033,7 +2345,7 @@
               "key": "prefix",
               "type": "string",
               "default_value": "dev",
-              "random_string" : {
+              "random_string": {
                 "length": 4
               },
               "description": "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). Used to avoid name clashes in the target account when deploying this solution multiple times.",
@@ -2134,7 +2446,7 @@
               "key": "key_protect_plan",
               "type": "string",
               "default_value": "tiered-pricing",
-              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_kms_instance_crn`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
+              "description": "The service plan of the Key Protect instance that will be provisioned by this solution. Only used if not supplying `existing_key_protect_instance`. [Learn more](https://cloud.ibm.com/docs/key-protect?topic=key-protect-pricing-plan).",
               "required": false,
               "options": [
                 {
@@ -2190,7 +2502,12 @@
               "custom_config": {
                 "type": "code_editor",
                 "grouping": "deployment",
-                "original_grouping": "deployment"
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "supportedLanguages": [
+                    "hcl"
+                  ]
+                }
               }
             },
             {
@@ -2323,66 +2640,165 @@
             },
             {
               "key": "existing_secrets_manager_crn",
+              "display_name": "existing_secrets_manager",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
-              "required": false
+              "description": "An existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "secrets-manager",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_kms_instance_crn",
+              "display_name": "existing_key_protect_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing KMS instance to use in this solution. If not set, a new KP instance is provisioned.",
-              "required": false
+              "description": "An existing Key Protect instance to use in this solution. If not set, a new instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "kms",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_event_notifications_instance_crn",
+              "display_name": "existing_event_notifications_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing event notification instance to use in this solution. If not set, a new event notification instance is provisioned.",
-              "required": false
+              "description": "An existing Event Notifications instance to use in this solution. If not set, a new event notification instance is provisioned.",
+              "required": false,
+                "custom_config": {
+                  "type": "platform_resource",
+                  "grouping": "deployment",
+                  "original_grouping": "deployment",
+                  "config_constraints": {
+                    "resourceType": "event-notifications",
+                    "selection": "single_select",
+                    "valueType": "crn"
+                  }
+                }
             },
             {
               "key": "existing_discovery_instance_crn",
+              "display_name": "existing_watson_discovery_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS discovery instance to use in this solution. If not set, a new discovery instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing Watson Discovery instance to use in this solution. If not set, a new Discovery instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "discovery",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_assistant_instance_crn",
+              "display_name": "existing_watsonx_assistant_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS assistant instance to use in this solution. If not set, a new assistant instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx Assistant instance to use in this solution. If not set, a new Assistant instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "conversation",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_governance_instance_crn",
+              "display_name": "existing_watsonx_governance_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS governance instance to use in this solution. If not set, a new governance instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.governance instance to use in this solution. If not set, a new watsonx.governance instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "aiopenscale",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_studio_instance_crn",
+              "display_name": "existing_watsonx_ai_studio_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS studio instance to use in this solution. If not set, a new studio instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Studio instance to use in this solution. If not set, a new watsonx.ai Studio instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "data-science-experience",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_machine_learning_instance",
+              "display_name": "existing_watsonx_ai_runtime_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing WatsonX SaaS machine learning instance to use in this solution. If not set, a new machine learning instance is provisioned depending on which plan is selected.",
-              "required": false
+              "description": "An existing watsonx.ai Runtime instance to use in this solution. If not set, a new watsonx.ai Runtime instance is provisioned depending on which plan is selected.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "pm-20",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             },
             {
               "key": "existing_elasticsearch_instance_crn",
+              "display_name": "existing_elasticsearch_instance",
               "type": "string",
               "default_value": "__NULL__",
-              "description": "The CRN of an existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
-              "required": false
+              "description": "An existing elasticsearch instance to use in this solution. If not set, a new elasticsearch instance is provisioned.",
+              "required": false,
+              "custom_config": {
+                "type": "platform_resource",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "resourceType": "databases-for-elasticsearch",
+                  "selection": "single_select",
+                  "valueType": "crn"
+                }
+              }
             }
           ],
           "outputs": [
diff --git a/solutions/basic-without-sample-app/stack_definition.json b/solutions/basic-without-sample-app/stack_definition.json
index 5ab0738a..5785ff66 100644
--- a/solutions/basic-without-sample-app/stack_definition.json
+++ b/solutions/basic-without-sample-app/stack_definition.json
@@ -168,7 +168,7 @@
   "members": [
     {
       "name": "1 - Account Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e456e60-9ca9-4e9e-8f28-6265f8a12f97-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.13eba024-dfce-4088-bec4-0b1a5fea133d-global",
       "inputs": [
         {
           "name": "prefix",
@@ -210,7 +210,7 @@
     },
     {
       "name": "2a - Essential Security - Encryption Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.83d1bcb6-41d9-43b8-bd0b-14aea5d0f923-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -236,7 +236,7 @@
     },
     {
       "name": "2b - Essential Security - Cloud Object Storage",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6433c58f-9e1b-4520-ae52-5ab4f4559cf9-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9510728f-c31b-425c-a94a-d1585e1f22f3-global",
       "inputs": [
         {
           "name": "prefix",
@@ -250,7 +250,7 @@
     },
     {
       "name": "2c - Essential Security - Cloud Monitoring",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4c21c293-3f7d-454b-97bc-9808aee58bfe-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1245fc03-8a1a-43cd-a3d1-4e517a5d006d-global",
       "inputs": [
         {
           "name": "region",
@@ -280,7 +280,7 @@
     },
     {
       "name": "2d - Workload - Code Engine Project",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.529f261f-1680-4e95-8108-b991e2527f88-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -324,7 +324,7 @@
     },
     {
       "name": "3a - Essential Security - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global",
       "inputs": [
         {
           "name": "existing_cos_instance_crn",
@@ -448,7 +448,7 @@
     },
     {
       "name": "4a - Essential Security - Cloud Logs for logging",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -494,7 +494,7 @@
     },
     {
       "name": "4b - Essential Security - App Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bff2dc4d-9e19-4b2c-8890-4cda020ce39e-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1812cea7-7a3a-4d1e-a851-a369b00988de-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -560,7 +560,7 @@
     },
     {
       "name": "4c - Essential Security - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c7ba4599-f65a-4a9b-bd6b-120e52947652-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3bfcc0f7-6134-4ad6-b123-f1271300f578-global",
       "inputs": [
         {
           "name": "prefix",
@@ -606,7 +606,7 @@
     },
     {
       "name": "4d - Essential Security - Cloud Logs for activity tracking",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -664,7 +664,7 @@
     },
     {
       "name": "5a - Essential Security - Security and Compliance Center Workload Protection",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e543e47d-1b78-4415-963c-3c59fcf5ef2b-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.57317030-f99f-4699-b685-59036bd70c5c-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -698,7 +698,7 @@
     },
     {
       "name": "5b - Gen AI - Databases for Elasticsearch",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a25caea-0f63-4911-a5fb-c1ef792edea0-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.890832b7-16c9-41f7-8d4f-21a8b6ba80bf-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -722,7 +722,7 @@
         },
         {
           "name": "elasticsearch_version",
-          "value": "8.15"
+          "value": "8.19"
         },
         {
           "name": "kms_encryption_enabled",
@@ -763,7 +763,7 @@
     },
     {
       "name": "5c - Essential Security - Activity Tracker Event Routing",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1d61413e-c149-4a3a-bd6d-9207e0c60385-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b4eaef05-19ca-46b7-a9ef-13df45fe6e20-global",
       "inputs": [
         {
           "name": "region",
diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json
index 5ac54569..32d89bad 100644
--- a/solutions/basic/stack_definition.json
+++ b/solutions/basic/stack_definition.json
@@ -180,7 +180,7 @@
   "members": [
     {
       "name": "1 - Account Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e456e60-9ca9-4e9e-8f28-6265f8a12f97-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.13eba024-dfce-4088-bec4-0b1a5fea133d-global",
       "inputs": [
         {
           "name": "prefix",
@@ -226,7 +226,7 @@
     },
     {
       "name": "2a - Essential Security - Encryption Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.83d1bcb6-41d9-43b8-bd0b-14aea5d0f923-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -252,7 +252,7 @@
     },
     {
       "name": "2b - Essential Security - Cloud Object Storage",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6433c58f-9e1b-4520-ae52-5ab4f4559cf9-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9510728f-c31b-425c-a94a-d1585e1f22f3-global",
       "inputs": [
         {
           "name": "prefix",
@@ -266,7 +266,7 @@
     },
     {
       "name": "2c - Essential Security - Cloud Monitoring",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4c21c293-3f7d-454b-97bc-9808aee58bfe-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1245fc03-8a1a-43cd-a3d1-4e517a5d006d-global",
       "inputs": [
         {
           "name": "region",
@@ -296,7 +296,7 @@
     },
     {
       "name": "2d - Workload - Code Engine Project for CI",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.529f261f-1680-4e95-8108-b991e2527f88-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -318,7 +318,7 @@
     },
     {
       "name": "2e - Workload - Code Engine Project for CD",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.529f261f-1680-4e95-8108-b991e2527f88-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -362,7 +362,7 @@
     },
     {
       "name": "3a - Essential Security - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global",
       "inputs": [
         {
           "name": "existing_cos_instance_crn",
@@ -484,9 +484,51 @@
         }
       ]
     },
+    {
+      "name": "3c - Workload - DevSecOps evidence locker Object Storage bucket",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8ed78d53-edef-463f-8231-31fd18a41389-global",
+      "inputs": [
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "kms_encryption_enabled",
+          "value": true
+        },
+        {
+          "name": "existing_kms_instance_crn",
+          "value": "ref:../2a - Essential Security - Encryption Key Management/outputs/kms_instance_crn"
+        },
+        {
+          "name": "cos_key_ring_name",
+          "value": "devsecops"
+        },
+        {
+          "name": "cos_key_name",
+          "value": "evidence-bucket-key"
+        },
+        {
+          "name": "region",
+          "value": "ref:../../inputs/region"
+        },
+        {
+          "name": "existing_cos_instance_crn",
+          "value": "ref:../2b - Essential Security - Cloud Object Storage/outputs/cos_instance_crn"
+        },
+        {
+          "name": "bucket_name",
+          "value": "evidence-locker"
+        },
+        {
+          "name": "monitoring_crn",
+          "value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_crn"
+        }
+      ]
+    },
     {
       "name": "4a - Essential Security - Cloud Logs for logging",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -532,7 +574,7 @@
     },
     {
       "name": "4b - Essential Security - App Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bff2dc4d-9e19-4b2c-8890-4cda020ce39e-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1812cea7-7a3a-4d1e-a851-a369b00988de-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -598,7 +640,7 @@
     },
     {
       "name": "4c - Essential Security - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c7ba4599-f65a-4a9b-bd6b-120e52947652-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3bfcc0f7-6134-4ad6-b123-f1271300f578-global",
       "inputs": [
         {
           "name": "prefix",
@@ -644,7 +686,7 @@
     },
     {
       "name": "4d - Essential Security - Cloud Logs for activity tracking",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -702,7 +744,7 @@
     },
     {
       "name": "5a - Essential Security - Security and Compliance Center Workload Protection",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e543e47d-1b78-4415-963c-3c59fcf5ef2b-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.57317030-f99f-4699-b685-59036bd70c5c-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -736,7 +778,7 @@
     },
     {
       "name": "5b - Gen AI - Databases for Elasticsearch",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a25caea-0f63-4911-a5fb-c1ef792edea0-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.890832b7-16c9-41f7-8d4f-21a8b6ba80bf-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -760,7 +802,7 @@
         },
         {
           "name": "elasticsearch_version",
-          "value": "8.15"
+          "value": "8.19"
         },
         {
           "name": "kms_encryption_enabled",
@@ -802,7 +844,7 @@
     },
     {
       "name": "5c - Workload - DevSecOps Application Lifecycle Management",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.844034e5-4ccc-4fb7-af46-e43c20d00a72-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.12614d0c-67b8-4dd5-b729-1e96764f9ddc-global",
       "inputs": [
         {
           "name": "toolchain_name",
@@ -872,6 +914,18 @@
           "name": "pipeline_ibmcloud_api_key_secret_name",
           "value": "ibmcloud-api-key"
         },
+        {
+          "name": "cos_api_key_secret_name",
+          "value": "ibmcloud-api-key"
+        },
+        {
+          "name": "cos_bucket_name",
+          "value": "ref:../3c - Workload - DevSecOps evidence locker Object Storage bucket/outputs/bucket_name"
+        },
+        {
+          "name": "cos_endpoint",
+          "value": "ref:../3c - Workload - DevSecOps evidence locker Object Storage bucket/outputs/s3_endpoint_direct"
+        },
         {
           "name": "prefix",
           "value": "ref:../../inputs/prefix"
@@ -885,18 +939,26 @@
           "value": "ref:../2f - Workload - Container Registry/outputs/namespace_name"
         },
         {
-          "name": "add_container_name_suffix",
-          "value": true
+          "name": "add_code_engine_prefix",
+          "value": false
         },
         {
-          "name": "add_code_engine_prefix",
+          "name": "evidence_repo_enabled",
+          "value": false
+        },
+        {
+          "name": "enable_cos",
           "value": false
+        },
+        {
+          "name": "scc_enable_scc",
+          "value": "false"
         }
       ]
     },
     {
       "name": "5d - Essential Security - Activity Tracker Event Routing",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1d61413e-c149-4a3a-bd6d-9207e0c60385-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b4eaef05-19ca-46b7-a9ef-13df45fe6e20-global",
       "inputs": [
         {
           "name": "region",
diff --git a/solutions/standard-without-sample-app/stack_definition.json b/solutions/standard-without-sample-app/stack_definition.json
index 9445415c..bb259f8c 100644
--- a/solutions/standard-without-sample-app/stack_definition.json
+++ b/solutions/standard-without-sample-app/stack_definition.json
@@ -168,7 +168,7 @@
   "members": [
     {
       "name": "1 - Account Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e456e60-9ca9-4e9e-8f28-6265f8a12f97-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.13eba024-dfce-4088-bec4-0b1a5fea133d-global",
       "inputs": [
         {
           "name": "prefix",
@@ -210,7 +210,7 @@
     },
     {
       "name": "2a - Essential Security - Encryption Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.83d1bcb6-41d9-43b8-bd0b-14aea5d0f923-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -236,7 +236,7 @@
     },
     {
       "name": "2b - Essential Security - Cloud Object Storage",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6433c58f-9e1b-4520-ae52-5ab4f4559cf9-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9510728f-c31b-425c-a94a-d1585e1f22f3-global",
       "inputs": [
         {
           "name": "prefix",
@@ -250,7 +250,7 @@
     },
     {
       "name": "2c - Essential Security - Cloud Monitoring",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4c21c293-3f7d-454b-97bc-9808aee58bfe-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1245fc03-8a1a-43cd-a3d1-4e517a5d006d-global",
       "inputs": [
         {
           "name": "region",
@@ -302,7 +302,7 @@
     },
     {
       "name": "3a - Essential Security - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global",
       "inputs": [
         {
           "name": "existing_cos_instance_crn",
@@ -426,7 +426,7 @@
     },
     {
       "name": "3c - Workload - Compute Red Hat OpenShift Container Platform on VPC",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.cb341280-efa5-4bdf-8976-cea6ea62c3a4-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.a897689b-0ed7-4127-ad1e-dde6db340095-global",
       "inputs": [
         {
           "name": "prefix",
@@ -497,7 +497,7 @@
     },
     {
       "name": "4a - Essential Security - Cloud Logs for logging",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -543,7 +543,7 @@
     },
     {
       "name": "4b - Essential Security - App Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bff2dc4d-9e19-4b2c-8890-4cda020ce39e-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1812cea7-7a3a-4d1e-a851-a369b00988de-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -609,7 +609,7 @@
     },
     {
       "name": "4c - Essential Security - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c7ba4599-f65a-4a9b-bd6b-120e52947652-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3bfcc0f7-6134-4ad6-b123-f1271300f578-global",
       "inputs": [
         {
           "name": "prefix",
@@ -655,7 +655,7 @@
     },
     {
       "name": "4d - Essential Security - Cloud Logs for activity tracking",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -713,7 +713,7 @@
     },
     {
       "name": "5a - Essential Security - Security and Compliance Center Workload Protection",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e543e47d-1b78-4415-963c-3c59fcf5ef2b-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.57317030-f99f-4699-b685-59036bd70c5c-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -747,7 +747,7 @@
     },
     {
       "name": "5b - Gen AI - Databases for Elasticsearch",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a25caea-0f63-4911-a5fb-c1ef792edea0-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.890832b7-16c9-41f7-8d4f-21a8b6ba80bf-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -771,7 +771,7 @@
         },
         {
           "name": "elasticsearch_version",
-          "value": "8.15"
+          "value": "8.19"
         },
         {
           "name": "kms_encryption_enabled",
@@ -813,7 +813,7 @@
     },
     {
       "name": "5c - Essential Security - Activity Tracker Event Routing",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1d61413e-c149-4a3a-bd6d-9207e0c60385-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b4eaef05-19ca-46b7-a9ef-13df45fe6e20-global",
       "inputs": [
         {
           "name": "region",
@@ -851,7 +851,7 @@
     },
     {
       "name": "5d - Workload Essential Security - Red Hat OpenShift logging agent",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6a32a898-804a-4e6f-833d-0dde755e1261-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.45a4fdd3-58ce-4842-92a1-48c899dc4f8b-global",
       "inputs": [
         {
           "name": "prefix",
@@ -870,6 +870,32 @@
           "value": "ref:../4a - Essential Security - Cloud Logs for logging/outputs/cloud_logs_ingress_private_endpoint"
         }
       ]
+    },
+    {
+      "name": "5e - Workload Essential Security - Red Hat OpenShift Monitoring and Workload Protection agent",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.660fc0d9-2af6-4a2b-a3ac-6f8b2bbf0063-global",
+      "inputs": [
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "cluster_id",
+          "value": "ref:../3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_id"
+        },
+        {
+          "name": "cluster_resource_group_id",
+          "value": "ref:../3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_rg_id"
+        },
+        {
+          "name": "instance_crn",
+          "value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_crn"
+        },
+         {
+          "name": "access_key",
+          "value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_access_key"
+        }
+      ]
     }
   ],
   "outputs": [
diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json
index c034f91f..8f2623bb 100644
--- a/solutions/standard/stack_definition.json
+++ b/solutions/standard/stack_definition.json
@@ -180,7 +180,7 @@
   "members": [
     {
       "name": "1 - Account Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e456e60-9ca9-4e9e-8f28-6265f8a12f97-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.13eba024-dfce-4088-bec4-0b1a5fea133d-global",
       "inputs": [
         {
           "name": "prefix",
@@ -226,7 +226,7 @@
     },
     {
       "name": "2a - Essential Security - Encryption Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.83d1bcb6-41d9-43b8-bd0b-14aea5d0f923-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -252,7 +252,7 @@
     },
     {
       "name": "2b - Essential Security - Cloud Object Storage",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6433c58f-9e1b-4520-ae52-5ab4f4559cf9-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9510728f-c31b-425c-a94a-d1585e1f22f3-global",
       "inputs": [
         {
           "name": "prefix",
@@ -266,7 +266,7 @@
     },
     {
       "name": "2c - Essential Security - Cloud Monitoring",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4c21c293-3f7d-454b-97bc-9808aee58bfe-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1245fc03-8a1a-43cd-a3d1-4e517a5d006d-global",
       "inputs": [
         {
           "name": "region",
@@ -318,7 +318,7 @@
     },
     {
       "name": "3a - Essential Security - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global",
       "inputs": [
         {
           "name": "existing_cos_instance_crn",
@@ -442,7 +442,7 @@
     },
     {
       "name": "3c - Workload - Compute Red Hat OpenShift Container Platform on VPC",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.cb341280-efa5-4bdf-8976-cea6ea62c3a4-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.a897689b-0ed7-4127-ad1e-dde6db340095-global",
       "inputs": [
         {
           "name": "prefix",
@@ -511,9 +511,51 @@
         }
       ]
     },
+    {
+      "name": "3d - Workload - DevSecOps evidence locker Object Storage bucket",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8ed78d53-edef-463f-8231-31fd18a41389-global",
+      "inputs": [
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "kms_encryption_enabled",
+          "value": true
+        },
+        {
+          "name": "existing_kms_instance_crn",
+          "value": "ref:../2a - Essential Security - Encryption Key Management/outputs/kms_instance_crn"
+        },
+        {
+          "name": "cos_key_ring_name",
+          "value": "devsecops"
+        },
+        {
+          "name": "cos_key_name",
+          "value": "evidence-bucket-key"
+        },
+        {
+          "name": "region",
+          "value": "ref:../../inputs/region"
+        },
+        {
+          "name": "existing_cos_instance_crn",
+          "value": "ref:../2b - Essential Security - Cloud Object Storage/outputs/cos_instance_crn"
+        },
+        {
+          "name": "bucket_name",
+          "value": "evidence-locker"
+        },
+        {
+          "name": "monitoring_crn",
+          "value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_crn"
+        }
+      ]
+    },
     {
       "name": "4a - Essential Security - Cloud Logs for logging",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -559,7 +601,7 @@
     },
     {
       "name": "4b - Essential Security - App Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bff2dc4d-9e19-4b2c-8890-4cda020ce39e-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1812cea7-7a3a-4d1e-a851-a369b00988de-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -625,7 +667,7 @@
     },
     {
       "name": "4c - Essential Security - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c7ba4599-f65a-4a9b-bd6b-120e52947652-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3bfcc0f7-6134-4ad6-b123-f1271300f578-global",
       "inputs": [
         {
           "name": "prefix",
@@ -671,7 +713,7 @@
     },
     {
       "name": "4d - Essential Security - Cloud Logs for activity tracking",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
       "inputs": [
         {
           "name": "region",
@@ -729,7 +771,7 @@
     },
     {
       "name": "5a - Essential Security - Security and Compliance Center Workload Protection",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e543e47d-1b78-4415-963c-3c59fcf5ef2b-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.57317030-f99f-4699-b685-59036bd70c5c-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -763,7 +805,7 @@
     },
     {
       "name": "5b - Gen AI - Databases for Elasticsearch",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a25caea-0f63-4911-a5fb-c1ef792edea0-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.890832b7-16c9-41f7-8d4f-21a8b6ba80bf-global",
       "inputs": [
         {
           "name": "existing_resource_group_name",
@@ -787,7 +829,7 @@
         },
         {
           "name": "elasticsearch_version",
-          "value": "8.15"
+          "value": "8.19"
         },
         {
           "name": "kms_encryption_enabled",
@@ -829,7 +871,7 @@
     },
     {
       "name": "5c - Workload - DevSecOps Application Lifecycle Management",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.64e4c450-7e38-427e-856b-7d158f146c8d-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9ddceee4-8100-48fd-8550-c72b304bd329-global",
       "inputs": [
         {
           "name": "toolchain_name",
@@ -883,6 +925,18 @@
           "name": "pipeline_ibmcloud_api_key_secret_name",
           "value": "ibmcloud-api-key"
         },
+        {
+          "name": "cos_api_key_secret_name",
+          "value": "ibmcloud-api-key"
+        },
+        {
+          "name": "cos_bucket_name",
+          "value": "ref:../3d - Workload - DevSecOps evidence locker Object Storage bucket/outputs/bucket_name"
+        },
+        {
+          "name": "cos_endpoint",
+          "value": "ref:../3d - Workload - DevSecOps evidence locker Object Storage bucket/outputs/s3_endpoint_direct"
+        },
         {
           "name": "use_legacy_ref",
           "value": false
@@ -899,10 +953,6 @@
           "name": "registry_namespace",
           "value": "ref:../2d - Workload - Container Registry/outputs/namespace_name"
         },
-        {
-          "name": "add_container_name_suffix",
-          "value": true
-        },
         {
           "name": "cc_pipeline_properties",
           "value": "[{\"pipeline_id\":\"cc\",\"properties\":[{\"name\":\"app-name\",\"type\":\"text\",\"value\":\"rag-sample-app\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"ibmcloud-api-key\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"environment-tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"opt-in-auto-close\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-cra-auto-remediation\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"opt-in-cra-auto-remediation-enabled-repos\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-cra-auto-remediation-force\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"}]}]"
@@ -914,12 +964,24 @@
         {
           "name": "ci_pipeline_properties",
           "value": "[{\"pipeline_id\":\"ci\",\"properties\":[{\"name\":\"cluster-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-generate-cyclonedx-format\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"custom_image_tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"dev-cluster-namespace\",\"type\":\"text\",\"value\":\"dev\"},{\"name\":\"dev-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"print-code-signing-certificate\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"registry-namespace\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"registry-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"signing-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]},{\"pipeline_id\":\"pr\",\"properties\":[{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"1\"}]}]"
+        },
+        {
+          "name": "evidence_repo_enabled",
+          "value": false
+        },
+        {
+          "name": "enable_cos",
+          "value": false
+        },
+        {
+          "name": "scc_enable_scc",
+          "value": "false"
         }
       ]
     },
     {
       "name": "5d - Essential Security - Activity Tracker Event Routing",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1d61413e-c149-4a3a-bd6d-9207e0c60385-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b4eaef05-19ca-46b7-a9ef-13df45fe6e20-global",
       "inputs": [
         {
           "name": "region",
@@ -957,7 +1019,7 @@
     },
     {
       "name": "5e - Workload Essential Security - Red Hat OpenShift logging agent",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6a32a898-804a-4e6f-833d-0dde755e1261-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.45a4fdd3-58ce-4842-92a1-48c899dc4f8b-global",
       "inputs": [
         {
           "name": "prefix",
@@ -977,6 +1039,32 @@
         }
       ]
     },
+    {
+      "name": "5f - Workload Essential Security - Red Hat OpenShift Monitoring and Workload Protection agent",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.660fc0d9-2af6-4a2b-a3ac-6f8b2bbf0063-global",
+      "inputs": [
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "cluster_id",
+          "value": "ref:../3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_id"
+        },
+        {
+          "name": "cluster_resource_group_id",
+          "value": "ref:../3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_rg_id"
+        },
+        {
+          "name": "instance_crn",
+          "value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_crn"
+        },
+         {
+          "name": "access_key",
+          "value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_access_key"
+        }
+      ]
+    },
     {
       "name": "6 - Workload - Sample RAG Application",
       "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e7af3542-6a4a-44fe-b646-2598bb925719-global",
diff --git a/tests/go.mod b/tests/go.mod
index 6ee17156..e7b045e5 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -1,23 +1,21 @@
 module github.com/terraform-ibm-modules/stack-ibm-retrieval-augmented-generation
 
-go 1.24.0
-
-toolchain go1.25.4
+go 1.25.5
 
 require (
 	github.com/gruntwork-io/terratest v0.54.0
 	github.com/stretchr/testify v1.11.1
-	github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.33
+	github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.5
 )
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
-	github.com/IBM-Cloud/power-go-client v1.13.0 // indirect
+	github.com/IBM-Cloud/power-go-client v1.14.3 // indirect
 	github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
-	github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
-	github.com/IBM/platform-services-go-sdk v0.90.0 // indirect
-	github.com/IBM/project-go-sdk v0.3.9 // indirect
+	github.com/IBM/go-sdk-core/v5 v5.21.2 // indirect
+	github.com/IBM/platform-services-go-sdk v0.90.4 // indirect
+	github.com/IBM/project-go-sdk v0.4.0 // indirect
 	github.com/IBM/schematics-go-sdk v0.4.0 // indirect
 	github.com/IBM/vpc-go-sdk v1.0.2 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -29,15 +27,15 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
-	github.com/go-git/go-git/v5 v5.16.3 // indirect
+	github.com/go-git/go-git/v5 v5.16.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.23.0 // indirect
-	github.com/go-openapi/errors v0.22.4 // indirect
+	github.com/go-openapi/errors v0.22.5 // indirect
 	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/loads v0.22.0 // indirect
@@ -48,7 +46,7 @@ require (
 	github.com/go-openapi/validate v0.24.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.26.0 // indirect
+	github.com/go-playground/validator/v10 v10.28.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
@@ -57,7 +55,7 @@ require (
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/hcl/v2 v2.22.0 // indirect
@@ -89,7 +87,7 @@ require (
 	go.opentelemetry.io/otel v1.35.0 // indirect
 	go.opentelemetry.io/otel/metric v1.35.0 // indirect
 	go.opentelemetry.io/otel/trace v1.35.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/mod v0.29.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
diff --git a/tests/go.sum b/tests/go.sum
index ce9294cb..d61c00f3 100644
--- a/tests/go.sum
+++ b/tests/go.sum
@@ -2,17 +2,17 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be h1:USOcBHkYQ4o/ccoEvoHinrba8NQthLJpFXnAoBY+MI4=
 github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be/go.mod h1:/7hMjdZA6fEpd/dQAOEABxKEwN0t72P3PlpEDu0Y7bE=
-github.com/IBM-Cloud/power-go-client v1.13.0 h1:TqxPlkJe0VkNdV9hYOD5NRepxEFhhyKXWXfg22x2zhU=
-github.com/IBM-Cloud/power-go-client v1.13.0/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
+github.com/IBM-Cloud/power-go-client v1.14.3 h1:qRA+DnqKSRfcgCeJRDUQXlqipYd6nWtNblubDeRYmhY=
+github.com/IBM-Cloud/power-go-client v1.14.3/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
 github.com/IBM/cloud-databases-go-sdk v0.8.1 h1:ULQ5L8V/9z79/qS185LqbIK2LD4kMtk3Hdhp4lFMVcw=
 github.com/IBM/cloud-databases-go-sdk v0.8.1/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc=
 github.com/IBM/go-sdk-core/v5 v5.9.2/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
-github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
-github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
-github.com/IBM/platform-services-go-sdk v0.90.0 h1:hsUkgZZBGYK+szFb0tF9Q7uy1VjMY+VlYAPgPwFPMrg=
-github.com/IBM/platform-services-go-sdk v0.90.0/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
-github.com/IBM/project-go-sdk v0.3.9 h1:D/UfMMn+vMQyvYf9EfocV6HrD3HcVpeIVoUSjNKuROo=
-github.com/IBM/project-go-sdk v0.3.9/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
+github.com/IBM/go-sdk-core/v5 v5.21.2 h1:mJ5QbLPOm4g5qhZiVB6wbSllfpeUExftGoyPek2hk4M=
+github.com/IBM/go-sdk-core/v5 v5.21.2/go.mod h1:ngpMgwkjur1VNUjqn11LPk3o5eCyOCRbcfg/0YAY7Hc=
+github.com/IBM/platform-services-go-sdk v0.90.4 h1:60oLi1S/9C23/BidRSC1MWNlQVEezk+x4giOb9NkEPQ=
+github.com/IBM/platform-services-go-sdk v0.90.4/go.mod h1:KAnBhxKaYsu9It2aVXV6oCPEj78imvTs2qSG0ScZKpM=
+github.com/IBM/project-go-sdk v0.4.0 h1:72pEtVHJn434+MYRawER7Hk/kblapdfotoLBBhjv/jo=
+github.com/IBM/project-go-sdk v0.4.0/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
 github.com/IBM/schematics-go-sdk v0.4.0 h1:x01f/tPquYJYLQzJLGuxWfCbV/EdSMXRikOceNy/JLM=
 github.com/IBM/schematics-go-sdk v0.4.0/go.mod h1:Xe7R7xgwmXBHu09w2CbBe8lkWZaYxNQo19bS4dpLrUA=
 github.com/IBM/vpc-go-sdk v1.0.2 h1:WhI1Cb8atA8glUdFg0SEUh9u8afjnKHxZAj9onQBi04=
@@ -57,8 +57,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
-github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
+github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
+github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
@@ -69,8 +69,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN
 github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.16.3 h1:Z8BtvxZ09bYm/yYNgPKCzgWtaRqDTgIKRgIRHBfU6Z8=
-github.com/go-git/go-git/v5 v5.16.3/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+github.com/go-git/go-git/v5 v5.16.4 h1:7ajIEZHZJULcyJebDLo99bGgS0jRrOxzZG4uCk2Yb2Y=
+github.com/go-git/go-git/v5 v5.16.4/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -83,8 +83,8 @@ github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC0
 github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo=
 github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
 github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
-github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM=
-github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
+github.com/go-openapi/errors v0.22.5 h1:Yfv4O/PRYpNF3BNmVkEizcHb3uLVVsrDt3LNdgAKRY4=
+github.com/go-openapi/errors v0.22.5/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
 github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
 github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
 github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
@@ -113,8 +113,8 @@ github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/Nu
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
-github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
+github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
@@ -166,8 +166,8 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
-github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
+github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
+github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
 github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
@@ -297,8 +297,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.33 h1:BGcYqJQtSGIwhHXqEqIG1Tr+zIy9llUaEPeokLW9gGs=
-github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.33/go.mod h1:9X9hk3QCx9h/5mmoWUwDT2ORmgvyr1tURcgDtiqlC2Q=
+github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.5 h1:IuCB+0oIKyOrMtZwx4ptasJuZD6DAbgBoZ3kKGDeOtQ=
+github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.61.5/go.mod h1:clGPU4e57ofDSgBbNSzjNMf4KlJxSbVbU0O3FLpqRns=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
 github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=
@@ -333,8 +333,8 @@ go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHy
 go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok=
 go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
-go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
-go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=