diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json
index dbbeb5d..5102ebd 100644
--- a/kubernetes/stack_definition.json
+++ b/kubernetes/stack_definition.json
@@ -1,885 +1,884 @@
 {
-	"inputs": [
-		{
-			"name": "region",
-			"required": true,
-			"type": "string",
-			"hidden": false,
-			"default": "us-south"
-		},
-		{
-			"name": "en_region",
-			"required": true,
-			"type": "string",
-			"hidden": false,
-			"default": "us-south",
-			"custom_config": {}
-		},
-		{
-			"name": "app_repo_existing_url",
-			"type": "string",
-			"hidden": false,
-			"default": "__NOTSET__",
-			"required": true
-		},
-		{
-			"name": "resource_group_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "devsecops-rg",
-			"custom_config": {}
-		},
-		{
-			"name": "bucket_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "devsecops"
-		},
-		{
-			"name": "prefix",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "devsecops"
-		},
-		{
-			"name": "use_existing_resource_group",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": ""
-		},
-		{
-			"name": "ibmcloud_api",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": ""
-		},
-		{
-			"name": "registry_namespace",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "devsecops"
-		},
-		{
-			"name": "create_cd_instance",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "sm_service_plan",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "standard",
-			"custom_config": {}
-		},
-		{
-			"name": "sm_secret_group",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "devsecops",
-			"custom_config": {}
-		},
-		{
-			"name": "cos_api_key_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "cos-api-key",
-			"custom_config": {}
-		},
-		{
-			"name": "pipeline_ibmcloud_api_key_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "ibmcloud-api-key",
-			"custom_config": {}
-		},
-		{
-			"name": "ci_signing_key_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "signing-key",
-			"custom_config": {}
-		},
-		{
-			"name": "cd_code_signing_cert_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "signing-certificate",
-			"custom_config": {}
-		},
-		{
-			"name": "app_repo_branch",
-			"type": "string",
-			"hidden": false,
-			"default": "main",
-			"required": false
-		},
-		{
-			"name": "app_repo_git_token_secret_name",
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"required": false
-		},
-		{
-			"name": "existing_secrets_manager_crn",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "__NULL__",
-			"custom_config": {}
-		},
-		{
-			"name": "create_icr_namespace",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "create_git_token",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-		{
-			"name": "force_create_standard_api_key",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		  },
-		{
-			"name": "repo_git_token_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_git_token_secret_value",
-			"required": false,
-			"type": "password",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_group",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_apply_settings_to_compliance_repos",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-		{
-			"name": "repo_git_provider",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_title",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_root_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_blind_connection",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-		{
-			"name": "repo_git_id",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "evidence_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "issues_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "inventory_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "cd_deployment_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "change_management_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "create_triggers",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "create_git_triggers",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_repo_use_group_settings",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_repo_git_provider",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_repo_git_id",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_existing_repo_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "add_pipeline_definitions",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "create_privateworker_secret",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-    	{
-			"name": "enable_privateworker",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-   		{
-			"name": "privateworker_credentials_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "private-worker-key",
-			"custom_config": {}
-		},
-    	{
-			"name": "privateworker_secret_value",
-			"required": false,
-			"type": "password",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "toolchain_access_group_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "devsecops-toolchain",
-			"custom_config": {}
-		},
-		{
-			"name": "use_legacy_ref",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-		{
-			"name": "cluster_name",
-			"required": true,
-			"type": "string",
-			"hidden": false,
-			"default": "mycluster"
-		},
-		{
-			"name": "ci_cluster_resource_group",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "ref:../../inputs/resource_group_name",
-			"custom_config": {}
-		},
-		{
-			"name": "ci_cluster_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "ref:../../inputs/cluster_name",
-			"custom_config": {}
-		},
-		{
-			"name": "ci_cluster_namespace",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "dev",
-			"custom_config": {}
-		},
-		{
-			"name": "ci_cluster_region",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "us-south",
-			"custom_config": {}
-		},
-		{
-			"name": "cd_cluster_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "ref:../../inputs/cluster_name",
-			"custom_config": {}
-		},
-		{
-			"name": "cd_cluster_namespace",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "prod",
-			"custom_config": {}
-		}
-	],
-	"members": [
-		{
-			"inputs": [
-				{
-					"name": "single_resource_group_name",
-					"value": "ref:../../inputs/resource_group_name"
-				},
-				{
-					"name": "use_existing_single_resource_group",
-					"value": "ref:../../inputs/use_existing_resource_group"
-				},
-				{
-					"name": "prefix",
-					"value": "ref:../../inputs/prefix"
-				}
-			],
-			"name": "1a - Resource Group",
-			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global"
-		},
-		{
-			"inputs": [
-				{
-					"name": "existing_resource_group_name",
-					"value": "ref:../../members/1a - Resource Group/outputs/single_resource_group_name"
-				},
-				{
-					"name": "region",
-					"value": "ref:../../inputs/region"
-				},
-				{
-					"name": "prefix",
-					"value": "ref:../../inputs/prefix"
-				}
-			],
-			"name": "1b - Key Management",
-			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.40397a62-acd4-4224-ba88-7d4bfa998222-global"
-		},
-		{
-			"inputs": [
-				{
-					"name": "existing_resource_group_name",
-					"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
-				},
-				{
-					"name": "instance_name",
-					"value": "evidence"
-				},
-				{
-					"name": "prefix",
-					"value": "ref:../../inputs/prefix"
-				}
-			],
-			"name": "2 - Cloud Object Storage",
-			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
-		},
-		{
-			"inputs": [
-				{
-					"name" : "bucket_name",
-					"value" : "ref:../../inputs/bucket_name"
-				},
-				{
-					"name" : "add_bucket_name_suffix",
-					"value" : true
-				},
-				{
-					"name": "existing_cos_instance_id",
-					"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
-				},
-				{
-					"name": "existing_kms_instance_crn",
-					"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
-				},
-				{
-					"name": "skip_iam_authorization_policy",
-					"value": false
-				}
-			],
-			"name": "3 - Cloud Object Bucket",
-			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global"
-		},
-		{
-			"inputs": [
-				{
-					"name": "existing_cos_instance_crn",
-					"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
-				},
-				{
-					"name": "enable_collecting_failed_events",
-					"value": true
-				},
-				{
-					"name": "kms_encryption_enabled",
-					"value": true
-				},
-				{
-					"name": "kms_endpoint_url",
-					"value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
-				},
-				{
-					"name": "prefix",
-					"value": "ref:../../inputs/prefix"
-				},
-				{
-					"name": "existing_kms_instance_crn",
-					"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
-				},
-				{
-					"name": "kms_endpoint_type",
-					"value": "private"
-				},
-				{
-					"name": "existing_resource_group_name",
-					"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
-				},
-				{
-					"name": "region",
-					"value": "ref:../../inputs/en_region"
-				}
-			],
-			"name": "4 - Event Notifications",
-			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
-		},
-		{
-			"inputs": [
-				{
-					"name": "existing_resource_group_name",
-					"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
-				},
-				{
-					"name": "use_existing_resource_group",
-					"value": true
-				},
-				{
-					"name": "region",
-					"value": "ref:../../inputs/region"
-				},
-				{
-					"name": "prefix",
-					"value": "ref:../../inputs/prefix"
-				},
-				{
-					"name": "existing_secrets_manager_crn",
-					"value": "ref:../../inputs/existing_secrets_manager_crn"
-				},
-				{
-					"name": "existing_kms_instance_crn",
-					"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
-				},
-				{
-					"name": "existing_event_notification_instance_crn",
-					"value": "ref:../../members/4 - Event Notifications/outputs/crn"
-				},
-				{
-					"name": "service_plan",
-					"value": "ref:../../inputs/sm_service_plan"
-				}
-			],
-			"name": "5 - Secrets Manager",
-			"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
-		},
-		{
-			"name": "6 - DevSecOps Toolchains",
-			"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.43ae08bc-e7b7-48d2-a768-b33708a9df02-global",
-			"inputs": [
-				{
-					"name": "ibmcloud_api_key",
-					"value": ""
-				},
-				{
-					"name": "toolchain_region",
-					"value": "ref:../../inputs/region"
-				},
-				{
-					"name": "toolchain_resource_group",
-					"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
-				},
-				{
-					"name": "sm_secret_group",
-					"value": "ref:../../inputs/sm_secret_group"
-				},
-				{
-					"name": "sm_resource_group",
-					"value": "ref:../../members/5 - Secrets Manager/outputs/resource_group_name"
-				},
-				{
-					"name": "sm_name",
-					"value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_name"
-				},
-				{
-					"name": "sm_location",
-					"value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_region"
-				},
-				{
-					"name": "repositories_prefix",
-					"value": "ref:../../inputs/prefix"
-				},
-				{
-					"name": "event_notifications_crn",
-					"value": "ref:../../members/4 - Event Notifications/outputs/crn"
-				},
-				{
-					"name": "enable_cos",
-					"value" : true
-				},
-				{
-					"name" : "cos_bucket_name",
-					"value" : "ref:../../members/3 - Cloud Object Bucket/outputs/bucket_name"
-				},
-				{
-					"name" : "cos_endpoint",
-					"value" : "ref:../../members/3 - Cloud Object Bucket/outputs/s3_endpoint_direct"
-				},
-				{
-					"name": "cos_instance_crn",
-					"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
-				},
-				{
-					"name" : "ibmcloud_api",
-					"value" : "ref:../../inputs/ibmcloud_api"
-				},
-				{
-					"name" : "registry_namespace",
-					"value" : "ref:../../inputs/registry_namespace"
-				},
-				{
-					"name": "prefix",
-					"value": "ref:../../inputs/prefix"
-				},
-				{
-					"name": "add_container_name_suffix",
-					"value": "true"
-				},
-				{
-					"name": "create_icr_namespace",
-					"value": "ref:../../inputs/create_icr_namespace"
-				},
-				{
-					"name": "create_cd_instance",
-					"value": "ref:../../inputs/create_cd_instance"
-				},
-
-				{
-					"name" : "create_secret_group",
-					"value" : true
-				},
-				{
-					"name" : "create_ibmcloud_api_key",
-					"value" : true
-				},
-				{
-					"name" : "create_cos_api_key",
-					"value" : true
-				},
-				{
-					"name" : "create_signing_key",
-					"value" : true
-				},
-				{
-					"name": "create_access_group",
-					"value": true
-				},
-				{
-					"name" : "pipeline_ibmcloud_api_key_secret_name",
-					"value" : "ref:../../inputs/pipeline_ibmcloud_api_key_secret_name"
-				},
-				{
-					"name" : "ci_signing_key_secret_name",
-					"value" : "ref:../../inputs/ci_signing_key_secret_name"
-				},
-				{
-					"name" : "cd_code_signing_cert_secret_name",
-					"value" : "ref:../../inputs/cd_code_signing_cert_secret_name"
-				},
-				{
-					"name" : "cos_api_key_secret_name",
-					"value" : "ref:../../inputs/cos_api_key_secret_name"
-				},
-				{
-					"name": "force_create_standard_api_key",
-					"value": "ref:../../inputs/force_create_standard_api_key"
-				},
-				{
-					"name": "create_git_token",
-					"value": "ref:../../inputs/create_git_token"
-				},
-				{
-					"name": "repo_git_token_secret_name",
-					"value": "ref:../../inputs/repo_git_token_secret_name"
-				},
-				{
-					"name": "repo_git_token_secret_value",
-					"value": "ref:../../inputs/repo_git_token_secret_value"
-				},
-				{
-					"name": "repo_group",
-					"value": "ref:../../inputs/repo_group"
-				},
-				{
-					"name": "repo_apply_settings_to_compliance_repos",
-					"value": "ref:../../inputs/repo_apply_settings_to_compliance_repos"
-				},
-				{
-					"name": "repo_git_provider",
-					"value": "ref:../../inputs/repo_git_provider"
-				},
-				{
-					"name": "repo_title",
-					"value": "ref:../../inputs/repo_title"
-				},
-				{
-					"name": "repo_root_url",
-					"value": "ref:../../inputs/repo_root_url"
-				},
-				{
-					"name": "repo_blind_connection",
-					"value": "ref:../../inputs/repo_blind_connection"
-				},
-				{
-					"name": "repo_git_id",
-					"value": "ref:../../inputs/repo_git_id"
-				},
-				{
-					"name": "app_repo_existing_url",
-					"value": "ref:../../inputs/app_repo_existing_url"
-				},
-				{
-					"name": "evidence_repo_existing_url",
-					"value": "ref:../../inputs/evidence_repo_existing_url"
-				},
-				{
-					"name": "issues_repo_existing_url",
-					"value": "ref:../../inputs/issues_repo_existing_url"
-				},
-				{
-					"name": "inventory_repo_existing_url",
-					"value": "ref:../../inputs/inventory_repo_existing_url"
-				},
-				{
-					"name": "cd_deployment_repo_existing_url",
-					"value": "ref:../../inputs/cd_deployment_repo_existing_url"
-				},
-				{
-					"name": "change_management_existing_url",
-					"value": "ref:../../inputs/change_management_existing_url"
-				},
-				{
-					"name": "create_triggers",
-					"value": "ref:../../inputs/create_triggers"
-				},
-				{
-					"name": "create_git_triggers",
-					"value": "ref:../../inputs/create_git_triggers"
-				},
-				{
-					"name": "compliance_pipeline_repo_use_group_settings",
-					"value": "ref:../../inputs/compliance_pipeline_repo_use_group_settings"
-				},
-				{
-					"name": "compliance_pipeline_repo_git_provider",
-					"value": "ref:../../inputs/compliance_pipeline_repo_git_provider"
-				},
-				{
-					"name": "compliance_pipeline_repo_git_id",
-					"value": "ref:../../inputs/compliance_pipeline_repo_git_id"
-				},
-				{
-					"name": "compliance_pipeline_existing_repo_url",
-					"value": "ref:../../inputs/compliance_pipeline_existing_repo_url"
-				},
-				{
-					"name": "add_pipeline_definitions",
-					"value": "ref:../../inputs/add_pipeline_definitions"
-				},
-				{
-					"name": "create_privateworker_secret",
-					"value": "ref:../../inputs/create_privateworker_secret"
-				},
-				{
-					"name": "enable_privateworker",
-					"value": "ref:../../inputs/enable_privateworker"
-				},
-				{
-					"name": "privateworker_credentials_secret_name",
-					"value": "ref:../../inputs/privateworker_credentials_secret_name"
-				},
-				{
-					"name": "privateworker_secret_value",
-					"value": "ref:../../inputs/privateworker_secret_value"
-				},
-				{
-					"name": "toolchain_access_group_name",
-					"value": "ref:../../inputs/toolchain_access_group_name"
-				},
-				{
-					"name": "use_legacy_ref",
-					"value": "ref:../../inputs/use_legacy_ref"
-				},
-				{
-					"name" : "cluster_name",
-					"value" : "ref:../../inputs/cluster_name"
-				},
-				{
-					"name" : "ci_cluster_name",
-					"value" : "ref:../../inputs/ci_cluster_name"
-				},
-				{
-					"name" : "ci_cluster_region",
-					"value" : "ref:../../inputs/ci_cluster_region"
-				},
-				{
-					"name" : "ci_cluster_resource_group",
-					"value" : "ref:../../inputs/ci_cluster_resource_group"
-				},
-				{
-					"name" : "cd_cluster_name",
-					"value" : "ref:../../inputs/cd_cluster_name"
-				},
-				{
-					"name" : "ci_cluster_namespace",
-					"value" : "ref:../../inputs/ci_cluster_namespace"
-				},
-				{
-					"name" : "cd_cluster_namespace",
-					"value" : "ref:../../inputs/cd_cluster_namespace"
-				}
-			]
-		}
-	],
-	"outputs": [
-		{
-			"name": "compliance-ci-toolchain",
-			"value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url"
-		},
-		{
-			"name": "compliance-cd-toolchain",
-			"value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url"
-		},
-		{
-			"name": "compliance-cc-toolchain",
-			"value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url"
-		}
-	]
-  }
+  "inputs": [
+    {
+      "name": "region",
+      "required": true,
+      "type": "string",
+      "hidden": false,
+      "default": "us-south"
+    },
+    {
+      "name": "en_region",
+      "required": true,
+      "type": "string",
+      "hidden": false,
+      "default": "us-south",
+      "custom_config": {}
+    },
+    {
+      "name": "app_repo_existing_url",
+      "type": "string",
+      "hidden": false,
+      "default": "__NOTSET__",
+      "required": true
+    },
+    {
+      "name": "resource_group_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "devsecops-rg",
+      "custom_config": {}
+    },
+    {
+      "name": "bucket_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "devsecops"
+    },
+    {
+      "name": "prefix",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "devsecops"
+    },
+    {
+      "name": "use_existing_resource_group",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": ""
+    },
+    {
+      "name": "ibmcloud_api",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": ""
+    },
+    {
+      "name": "registry_namespace",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "devsecops"
+    },
+    {
+      "name": "create_cd_instance",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "sm_service_plan",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "standard",
+      "custom_config": {}
+    },
+    {
+      "name": "sm_secret_group",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "devsecops",
+      "custom_config": {}
+    },
+    {
+      "name": "cos_api_key_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "cos-api-key",
+      "custom_config": {}
+    },
+    {
+      "name": "pipeline_ibmcloud_api_key_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "ibmcloud-api-key",
+      "custom_config": {}
+    },
+    {
+      "name": "ci_signing_key_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "signing-key",
+      "custom_config": {}
+    },
+    {
+      "name": "cd_code_signing_cert_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "signing-certificate",
+      "custom_config": {}
+    },
+    {
+      "name": "app_repo_branch",
+      "type": "string",
+      "hidden": false,
+      "default": "main",
+      "required": false
+    },
+    {
+      "name": "app_repo_git_token_secret_name",
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "required": false
+    },
+    {
+      "name": "existing_secrets_manager_crn",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "__NULL__",
+      "custom_config": {}
+    },
+    {
+      "name": "create_icr_namespace",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "create_git_token",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "force_create_standard_api_key",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_token_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_token_secret_value",
+      "required": false,
+      "type": "password",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_group",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_apply_settings_to_compliance_repos",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_provider",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_title",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_root_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_blind_connection",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_id",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "evidence_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "issues_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "inventory_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "cd_deployment_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "change_management_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "create_triggers",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "create_git_triggers",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_repo_use_group_settings",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_repo_git_provider",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_repo_git_id",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_existing_repo_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "add_pipeline_definitions",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "create_privateworker_secret",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "enable_privateworker",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "privateworker_credentials_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "private-worker-key",
+      "custom_config": {}
+    },
+    {
+      "name": "privateworker_secret_value",
+      "required": false,
+      "type": "password",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "toolchain_access_group_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "devsecops-toolchain",
+      "custom_config": {}
+    },
+    {
+      "name": "use_legacy_ref",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "cluster_name",
+      "required": true,
+      "type": "string",
+      "hidden": false,
+      "default": "mycluster"
+    },
+    {
+      "name": "ci_cluster_resource_group",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "ref:../../inputs/resource_group_name",
+      "custom_config": {}
+    },
+    {
+      "name": "ci_cluster_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "ref:../../inputs/cluster_name",
+      "custom_config": {}
+    },
+    {
+      "name": "ci_cluster_namespace",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "dev",
+      "custom_config": {}
+    },
+    {
+      "name": "ci_cluster_region",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "us-south",
+      "custom_config": {}
+    },
+    {
+      "name": "cd_cluster_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "ref:../../inputs/cluster_name",
+      "custom_config": {}
+    },
+    {
+      "name": "cd_cluster_namespace",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "prod",
+      "custom_config": {}
+    }
+  ],
+  "members": [
+    {
+      "inputs": [
+        {
+          "name": "single_resource_group_name",
+          "value": "ref:../../inputs/resource_group_name"
+        },
+        {
+          "name": "use_existing_single_resource_group",
+          "value": "ref:../../inputs/use_existing_resource_group"
+        },
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        }
+      ],
+      "name": "1a - Resource Group",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2ad479ad-cffe-4e12-90c5-eed6da49394c-global"
+    },
+    {
+      "inputs": [
+        {
+          "name": "existing_resource_group_name",
+          "value": "ref:../../members/1a - Resource Group/outputs/single_resource_group_name"
+        },
+        {
+          "name": "region",
+          "value": "ref:../../inputs/region"
+        },
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        }
+      ],
+      "name": "1b - Key Management",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global"
+    },
+    {
+      "inputs": [
+        {
+          "name": "existing_resource_group_name",
+          "value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
+        },
+        {
+          "name": "instance_name",
+          "value": "evidence"
+        },
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        }
+      ],
+      "name": "2 - Cloud Object Storage",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6d8e21a5-339f-456b-a105-0f7018e0c7dd-global"
+    },
+    {
+      "inputs": [
+        {
+          "name": "bucket_name",
+          "value": "ref:../../inputs/bucket_name"
+        },
+        {
+          "name": "add_bucket_name_suffix",
+          "value": true
+        },
+        {
+          "name": "existing_cos_instance_id",
+          "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
+        },
+        {
+          "name": "existing_kms_instance_crn",
+          "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
+        },
+        {
+          "name": "skip_iam_authorization_policy",
+          "value": false
+        }
+      ],
+      "name": "3 - Cloud Object Bucket",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c99615db-f410-4e83-b760-2144522ddf78-global"
+    },
+    {
+      "inputs": [
+        {
+          "name": "existing_cos_instance_crn",
+          "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
+        },
+        {
+          "name": "enable_collecting_failed_events",
+          "value": true
+        },
+        {
+          "name": "kms_encryption_enabled",
+          "value": true
+        },
+        {
+          "name": "kms_endpoint_url",
+          "value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
+        },
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "existing_kms_instance_crn",
+          "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
+        },
+        {
+          "name": "kms_endpoint_type",
+          "value": "private"
+        },
+        {
+          "name": "existing_resource_group_name",
+          "value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
+        },
+        {
+          "name": "region",
+          "value": "ref:../../inputs/en_region"
+        }
+      ],
+      "name": "4 - Event Notifications",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global"
+    },
+    {
+      "inputs": [
+        {
+          "name": "existing_resource_group_name",
+          "value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
+        },
+        {
+          "name": "use_existing_resource_group",
+          "value": true
+        },
+        {
+          "name": "region",
+          "value": "ref:../../inputs/region"
+        },
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "existing_secrets_manager_crn",
+          "value": "ref:../../inputs/existing_secrets_manager_crn"
+        },
+        {
+          "name": "existing_kms_instance_crn",
+          "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
+        },
+        {
+          "name": "existing_event_notification_instance_crn",
+          "value": "ref:../../members/4 - Event Notifications/outputs/crn"
+        },
+        {
+          "name": "service_plan",
+          "value": "ref:../../inputs/sm_service_plan"
+        }
+      ],
+      "name": "5 - Secrets Manager",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7ddb19c4-ec46-4267-ad71-2093d029fd41-global"
+    },
+    {
+      "name": "6 - DevSecOps Toolchains",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.64e4c450-7e38-427e-856b-7d158f146c8d-global",
+      "inputs": [
+        {
+          "name": "ibmcloud_api_key",
+          "value": ""
+        },
+        {
+          "name": "toolchain_region",
+          "value": "ref:../../inputs/region"
+        },
+        {
+          "name": "toolchain_resource_group",
+          "value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
+        },
+        {
+          "name": "sm_secret_group",
+          "value": "ref:../../inputs/sm_secret_group"
+        },
+        {
+          "name": "sm_resource_group",
+          "value": "ref:../../members/5 - Secrets Manager/outputs/resource_group_name"
+        },
+        {
+          "name": "sm_name",
+          "value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_name"
+        },
+        {
+          "name": "sm_location",
+          "value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_region"
+        },
+        {
+          "name": "repositories_prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "event_notifications_crn",
+          "value": "ref:../../members/4 - Event Notifications/outputs/crn"
+        },
+        {
+          "name": "enable_cos",
+          "value": true
+        },
+        {
+          "name": "cos_bucket_name",
+          "value": "ref:../../members/3 - Cloud Object Bucket/outputs/bucket_name"
+        },
+        {
+          "name": "cos_endpoint",
+          "value": "ref:../../members/3 - Cloud Object Bucket/outputs/s3_endpoint_direct"
+        },
+        {
+          "name": "cos_instance_crn",
+          "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
+        },
+        {
+          "name": "ibmcloud_api",
+          "value": "ref:../../inputs/ibmcloud_api"
+        },
+        {
+          "name": "registry_namespace",
+          "value": "ref:../../inputs/registry_namespace"
+        },
+        {
+          "name": "prefix",
+          "value": "ref:../../inputs/prefix"
+        },
+        {
+          "name": "add_container_name_suffix",
+          "value": "true"
+        },
+        {
+          "name": "create_icr_namespace",
+          "value": "ref:../../inputs/create_icr_namespace"
+        },
+        {
+          "name": "create_cd_instance",
+          "value": "ref:../../inputs/create_cd_instance"
+        },
+        {
+          "name": "create_secret_group",
+          "value": true
+        },
+        {
+          "name": "create_ibmcloud_api_key",
+          "value": true
+        },
+        {
+          "name": "create_cos_api_key",
+          "value": true
+        },
+        {
+          "name": "create_signing_key",
+          "value": true
+        },
+        {
+          "name": "create_access_group",
+          "value": true
+        },
+        {
+          "name": "pipeline_ibmcloud_api_key_secret_name",
+          "value": "ref:../../inputs/pipeline_ibmcloud_api_key_secret_name"
+        },
+        {
+          "name": "ci_signing_key_secret_name",
+          "value": "ref:../../inputs/ci_signing_key_secret_name"
+        },
+        {
+          "name": "cd_code_signing_cert_secret_name",
+          "value": "ref:../../inputs/cd_code_signing_cert_secret_name"
+        },
+        {
+          "name": "cos_api_key_secret_name",
+          "value": "ref:../../inputs/cos_api_key_secret_name"
+        },
+        {
+          "name": "force_create_standard_api_key",
+          "value": "ref:../../inputs/force_create_standard_api_key"
+        },
+        {
+          "name": "create_git_token",
+          "value": "ref:../../inputs/create_git_token"
+        },
+        {
+          "name": "repo_git_token_secret_name",
+          "value": "ref:../../inputs/repo_git_token_secret_name"
+        },
+        {
+          "name": "repo_git_token_secret_value",
+          "value": "ref:../../inputs/repo_git_token_secret_value"
+        },
+        {
+          "name": "repo_group",
+          "value": "ref:../../inputs/repo_group"
+        },
+        {
+          "name": "repo_apply_settings_to_compliance_repos",
+          "value": "ref:../../inputs/repo_apply_settings_to_compliance_repos"
+        },
+        {
+          "name": "repo_git_provider",
+          "value": "ref:../../inputs/repo_git_provider"
+        },
+        {
+          "name": "repo_title",
+          "value": "ref:../../inputs/repo_title"
+        },
+        {
+          "name": "repo_root_url",
+          "value": "ref:../../inputs/repo_root_url"
+        },
+        {
+          "name": "repo_blind_connection",
+          "value": "ref:../../inputs/repo_blind_connection"
+        },
+        {
+          "name": "repo_git_id",
+          "value": "ref:../../inputs/repo_git_id"
+        },
+        {
+          "name": "app_repo_existing_url",
+          "value": "ref:../../inputs/app_repo_existing_url"
+        },
+        {
+          "name": "evidence_repo_existing_url",
+          "value": "ref:../../inputs/evidence_repo_existing_url"
+        },
+        {
+          "name": "issues_repo_existing_url",
+          "value": "ref:../../inputs/issues_repo_existing_url"
+        },
+        {
+          "name": "inventory_repo_existing_url",
+          "value": "ref:../../inputs/inventory_repo_existing_url"
+        },
+        {
+          "name": "cd_deployment_repo_existing_url",
+          "value": "ref:../../inputs/cd_deployment_repo_existing_url"
+        },
+        {
+          "name": "change_management_existing_url",
+          "value": "ref:../../inputs/change_management_existing_url"
+        },
+        {
+          "name": "create_triggers",
+          "value": "ref:../../inputs/create_triggers"
+        },
+        {
+          "name": "create_git_triggers",
+          "value": "ref:../../inputs/create_git_triggers"
+        },
+        {
+          "name": "compliance_pipeline_repo_use_group_settings",
+          "value": "ref:../../inputs/compliance_pipeline_repo_use_group_settings"
+        },
+        {
+          "name": "compliance_pipeline_repo_git_provider",
+          "value": "ref:../../inputs/compliance_pipeline_repo_git_provider"
+        },
+        {
+          "name": "compliance_pipeline_repo_git_id",
+          "value": "ref:../../inputs/compliance_pipeline_repo_git_id"
+        },
+        {
+          "name": "compliance_pipeline_existing_repo_url",
+          "value": "ref:../../inputs/compliance_pipeline_existing_repo_url"
+        },
+        {
+          "name": "add_pipeline_definitions",
+          "value": "ref:../../inputs/add_pipeline_definitions"
+        },
+        {
+          "name": "create_privateworker_secret",
+          "value": "ref:../../inputs/create_privateworker_secret"
+        },
+        {
+          "name": "enable_privateworker",
+          "value": "ref:../../inputs/enable_privateworker"
+        },
+        {
+          "name": "privateworker_credentials_secret_name",
+          "value": "ref:../../inputs/privateworker_credentials_secret_name"
+        },
+        {
+          "name": "privateworker_secret_value",
+          "value": "ref:../../inputs/privateworker_secret_value"
+        },
+        {
+          "name": "toolchain_access_group_name",
+          "value": "ref:../../inputs/toolchain_access_group_name"
+        },
+        {
+          "name": "use_legacy_ref",
+          "value": "ref:../../inputs/use_legacy_ref"
+        },
+        {
+          "name": "cluster_name",
+          "value": "ref:../../inputs/cluster_name"
+        },
+        {
+          "name": "ci_cluster_name",
+          "value": "ref:../../inputs/ci_cluster_name"
+        },
+        {
+          "name": "ci_cluster_region",
+          "value": "ref:../../inputs/ci_cluster_region"
+        },
+        {
+          "name": "ci_cluster_resource_group",
+          "value": "ref:../../inputs/ci_cluster_resource_group"
+        },
+        {
+          "name": "cd_cluster_name",
+          "value": "ref:../../inputs/cd_cluster_name"
+        },
+        {
+          "name": "ci_cluster_namespace",
+          "value": "ref:../../inputs/ci_cluster_namespace"
+        },
+        {
+          "name": "cd_cluster_namespace",
+          "value": "ref:../../inputs/cd_cluster_namespace"
+        }
+      ]
+    }
+  ],
+  "outputs": [
+    {
+      "name": "compliance-ci-toolchain",
+      "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url"
+    },
+    {
+      "name": "compliance-cd-toolchain",
+      "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url"
+    },
+    {
+      "name": "compliance-cc-toolchain",
+      "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url"
+    }
+  ]
+}
diff --git a/stack_definition.json b/stack_definition.json
index 56e53e0..baafab7 100644
--- a/stack_definition.json
+++ b/stack_definition.json
@@ -16,12 +16,12 @@
       "custom_config": {}
     },
     {
-			"name": "app_repo_existing_url",
-			"type": "string",
-			"hidden": false,
-			"default": "__NOTSET__",
-			"required": true
-		},
+      "name": "app_repo_existing_url",
+      "type": "string",
+      "hidden": false,
+      "default": "__NOTSET__",
+      "required": true
+    },
     {
       "name": "resource_group_name",
       "required": false,
@@ -121,44 +121,44 @@
       "default": "signing-certificate",
       "custom_config": {}
     },
-		{
-			"name": "app_repo_branch",
-			"type": "string",
-			"hidden": false,
-			"default": "master",
-			"required": false
-		},
-		{
-			"name": "app_repo_git_token_secret_name",
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"required": false
-		},
-    {
-			"name": "existing_secrets_manager_crn",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "__NULL__",
-			"custom_config": {}
-		},
-    {
-			"name": "create_icr_namespace",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-    {
-			"name": "create_git_token",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
+    {
+      "name": "app_repo_branch",
+      "type": "string",
+      "hidden": false,
+      "default": "master",
+      "required": false
+    },
+    {
+      "name": "app_repo_git_token_secret_name",
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "required": false
+    },
+    {
+      "name": "existing_secrets_manager_crn",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "__NULL__",
+      "custom_config": {}
+    },
+    {
+      "name": "create_icr_namespace",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "create_git_token",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
     {
       "name": "force_create_standard_api_key",
       "required": false,
@@ -168,205 +168,205 @@
       "custom_config": {}
     },
     {
-			"name": "repo_git_token_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-    {
-			"name": "repo_git_token_secret_value",
-			"required": false,
-			"type": "password",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-    {
-			"name": "repo_group",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-    {
-			"name": "repo_apply_settings_to_compliance_repos",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-    {
-			"name": "repo_git_provider",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_title",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_root_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "repo_blind_connection",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-		{
-			"name": "repo_git_id",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "evidence_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "issues_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "inventory_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "cd_deployment_repo_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "change_management_existing_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "create_triggers",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-    {
-			"name": "create_git_triggers",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_repo_use_group_settings",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_repo_git_provider",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_repo_git_id",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "compliance_pipeline_existing_repo_url",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
-		{
-			"name": "add_pipeline_definitions",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": true,
-			"custom_config": {}
-		},
-    {
-			"name": "create_privateworker_secret",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-    	{
-			"name": "enable_privateworker",
-			"required": false,
-			"type": "boolean",
-			"hidden": false,
-			"default": false,
-			"custom_config": {}
-		},
-   		{
-			"name": "privateworker_credentials_secret_name",
-			"required": false,
-			"type": "string",
-			"hidden": false,
-			"default": "private-worker-key",
-			"custom_config": {}
-		},
-    	{
-			"name": "privateworker_secret_value",
-			"required": false,
-			"type": "password",
-			"hidden": false,
-			"default": "",
-			"custom_config": {}
-		},
+      "name": "repo_git_token_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_token_secret_value",
+      "required": false,
+      "type": "password",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_group",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_apply_settings_to_compliance_repos",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_provider",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_title",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_root_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "repo_blind_connection",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "repo_git_id",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "evidence_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "issues_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "inventory_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "cd_deployment_repo_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "change_management_existing_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "create_triggers",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "create_git_triggers",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_repo_use_group_settings",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_repo_git_provider",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_repo_git_id",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "compliance_pipeline_existing_repo_url",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
+    {
+      "name": "add_pipeline_definitions",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": true,
+      "custom_config": {}
+    },
+    {
+      "name": "create_privateworker_secret",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "enable_privateworker",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "privateworker_credentials_secret_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "private-worker-key",
+      "custom_config": {}
+    },
+    {
+      "name": "privateworker_secret_value",
+      "required": false,
+      "type": "password",
+      "hidden": false,
+      "default": "",
+      "custom_config": {}
+    },
     {
       "name": "toolchain_access_group_name",
       "required": false,
@@ -417,7 +417,7 @@
         }
       ],
       "name": "1a - Resource Group",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2ad479ad-cffe-4e12-90c5-eed6da49394c-global"
     },
     {
       "inputs": [
@@ -435,7 +435,7 @@
         }
       ],
       "name": "1b - Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.40397a62-acd4-4224-ba88-7d4bfa998222-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global"
     },
     {
       "inputs": [
@@ -453,9 +453,9 @@
         }
       ],
       "name": "2 - Cloud Object Storage",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6d8e21a5-339f-456b-a105-0f7018e0c7dd-global"
     },
-     {
+    {
       "inputs": [
         {
           "name": "bucket_name",
@@ -479,7 +479,7 @@
         }
       ],
       "name": "3 - Cloud Object Bucket",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c99615db-f410-4e83-b760-2144522ddf78-global"
     },
     {
       "inputs": [
@@ -492,9 +492,9 @@
           "value": true
         },
         {
-					"name": "kms_encryption_enabled",
-					"value": true
-				},
+          "name": "kms_encryption_enabled",
+          "value": true
+        },
         {
           "name": "kms_endpoint_url",
           "value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
@@ -521,7 +521,7 @@
         }
       ],
       "name": "4 - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global"
     },
     {
       "inputs": [
@@ -542,9 +542,9 @@
           "value": "ref:../../inputs/prefix"
         },
         {
-					"name": "existing_secrets_manager_crn",
-					"value": "ref:../../inputs/existing_secrets_manager_crn"
-				},
+          "name": "existing_secrets_manager_crn",
+          "value": "ref:../../inputs/existing_secrets_manager_crn"
+        },
         {
           "name": "existing_kms_instance_crn",
           "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
@@ -559,11 +559,11 @@
         }
       ],
       "name": "5 - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7ddb19c4-ec46-4267-ad71-2093d029fd41-global"
     },
     {
       "name": "6 - DevSecOps Toolchains",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9b435db4-ec9c-4d54-baab-210b9627b96c-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.844034e5-4ccc-4fb7-af46-e43c20d00a72-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -603,7 +603,7 @@
         },
         {
           "name": "enable_cos",
-          "value" : true
+          "value": true
         },
         {
           "name": "cos_bucket_name",
@@ -618,9 +618,9 @@
           "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
         },
         {
-					"name" : "ibmcloud_api",
-					"value" : "ref:../../inputs/ibmcloud_api"
-				},
+          "name": "ibmcloud_api",
+          "value": "ref:../../inputs/ibmcloud_api"
+        },
         {
           "name": "registry_namespace",
           "value": "ref:../../inputs/registry_namespace"
@@ -634,9 +634,9 @@
           "value": "true"
         },
         {
-					"name": "create_icr_namespace",
-					"value": "ref:../../inputs/create_icr_namespace"
-				},
+          "name": "create_icr_namespace",
+          "value": "ref:../../inputs/create_icr_namespace"
+        },
         {
           "name": "create_cd_instance",
           "value": "ref:../../inputs/create_cd_instance"
@@ -678,9 +678,9 @@
           "value": "ref:../../inputs/cos_api_key_secret_name"
         },
         {
-					"name": "force_create_standard_api_key",
-					"value": "ref:../../inputs/force_create_standard_api_key"
-				},
+          "name": "force_create_standard_api_key",
+          "value": "ref:../../inputs/force_create_standard_api_key"
+        },
         {
           "name": "create_git_token",
           "value": "ref:../../inputs/create_git_token"
@@ -722,9 +722,9 @@
           "value": "ref:../../inputs/repo_git_id"
         },
         {
-					"name": "app_repo_existing_url",
-					"value": "ref:../../inputs/app_repo_existing_url"
-				},
+          "name": "app_repo_existing_url",
+          "value": "ref:../../inputs/app_repo_existing_url"
+        },
         {
           "name": "evidence_repo_existing_url",
           "value": "ref:../../inputs/evidence_repo_existing_url"
@@ -773,30 +773,30 @@
           "name": "add_pipeline_definitions",
           "value": "ref:../../inputs/add_pipeline_definitions"
         },
-				{
-					"name": "create_privateworker_secret",
-					"value": "ref:../../inputs/create_privateworker_secret"
-				},
-				{
-					"name": "enable_privateworker",
-					"value": "ref:../../inputs/enable_privateworker"
-				},
-				{
-					"name": "privateworker_credentials_secret_name",
-					"value": "ref:../../inputs/privateworker_credentials_secret_name"
-				},
-				{
-					"name": "privateworker_secret_value",
-					"value": "ref:../../inputs/privateworker_secret_value"
-				},
-				{
-					"name": "toolchain_access_group_name",
-					"value": "ref:../../inputs/toolchain_access_group_name"
-				},
-        {
-					"name": "use_legacy_ref",
-					"value": "ref:../../inputs/use_legacy_ref"
-				},
+        {
+          "name": "create_privateworker_secret",
+          "value": "ref:../../inputs/create_privateworker_secret"
+        },
+        {
+          "name": "enable_privateworker",
+          "value": "ref:../../inputs/enable_privateworker"
+        },
+        {
+          "name": "privateworker_credentials_secret_name",
+          "value": "ref:../../inputs/privateworker_credentials_secret_name"
+        },
+        {
+          "name": "privateworker_secret_value",
+          "value": "ref:../../inputs/privateworker_secret_value"
+        },
+        {
+          "name": "toolchain_access_group_name",
+          "value": "ref:../../inputs/toolchain_access_group_name"
+        },
+        {
+          "name": "use_legacy_ref",
+          "value": "ref:../../inputs/use_legacy_ref"
+        },
         {
           "name": "ci_code_engine_project",
           "value": "ref:../../inputs/project_ci_name"
@@ -831,7 +831,7 @@
         }
       ],
       "name": "7a - Code Engine CI Project",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b82c8a79-20a1-49b5-8ec8-92d571a54e1b-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7bd194db-ef9b-494a-b6d5-912213490dea-global"
     },
     {
       "inputs": [
@@ -853,7 +853,7 @@
         }
       ],
       "name": "7b - Code Engine CD Project",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b82c8a79-20a1-49b5-8ec8-92d571a54e1b-global"
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7bd194db-ef9b-494a-b6d5-912213490dea-global"
     }
   ],
   "outputs": [