diff --git a/ibm_catalog.json b/ibm_catalog.json
index 8ba907c..ea71c0e 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -131,6 +131,13 @@
 							"required": false
 						},
 						{
+                            "key": "create_icr_namespace",
+                            "type": "boolean",
+                            "default_value": true,
+                            "description": "Set to `true` to have Terraform create the registry namespace. Setting to `false` will have the CI pipeline create the namespace if it does not already exist. Note: If a Terraform destroy is used, the ICR namespace along with all images will be removed.",
+                            "required": false
+                        },
+						{
 							"key": "registry_namespace",
 							"type": "string",
 							"default_value": "devsecops",
diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json
index ce4ef1c..11dcf5c 100644
--- a/kubernetes/stack_definition.json
+++ b/kubernetes/stack_definition.json
@@ -246,6 +246,14 @@
 			"hidden": false,
 			"default": "",
 			"custom_config": {}
+		},
+		{
+			"name": "create_icr_namespace",
+			"required": false,
+			"type": "boolean",
+			"hidden": false,
+			"default": true,
+			"custom_config": {}
 		}
 	],
 	"members": [
@@ -451,7 +459,7 @@
 		},
 		{
 			"name": "7 - DevSecOps Toolchains",
-			"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.7721322c-d795-4e44-b9a9-e10ee1565a06-global",
+			"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.db73948a-5b92-4d65-8b41-e92ba883270f-global",
 			"inputs": [
 				{
 					"name": "ibmcloud_api_key",
@@ -529,10 +537,6 @@
 					"name" : "create_signing_key",
 					"value" : true
 				},
-				{
-					"name" : "create_signing_certificate",
-					"value" : true
-				},
 				{
 					"name" : "pipeline_ibmcloud_api_key_secret_name",
 					"value" : "ref:../../inputs/pipeline_ibmcloud_api_key_secret_name"
@@ -581,6 +585,10 @@
 					"name": "add_container_name_suffix",
 					"value": "true"
 				},
+				{
+					"name": "create_icr_namespace",
+					"value": "ref:../../inputs/create_icr_namespace"
+				},
 				{
 				  "name": "create_git_token",
 				  "value": "ref:../../inputs/create_git_token"
@@ -595,7 +603,7 @@
 				},
 				{
 				  "name": "repo_group",
-				  "value": "ref:../../inputs/repo_git_token_secret_value"
+				  "value": "ref:../../inputs/repo_group"
 				}
 			]
 		}
diff --git a/stack_definition.json b/stack_definition.json
index d0a7493..a2d27e6 100644
--- a/stack_definition.json
+++ b/stack_definition.json
@@ -201,6 +201,14 @@
 			"hidden": false,
 			"default": "",
 			"custom_config": {}
+		},
+		{
+			"name": "create_icr_namespace",
+			"required": false,
+			"type": "boolean",
+			"hidden": false,
+			"default": true,
+			"custom_config": {}
 		}
   ],
   "members": [
@@ -428,7 +436,7 @@
     },
     {
       "name": "8 - DevSecOps Toolchains",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.4efc4831-c0ce-4c27-8f88-021d5985e7f5-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9974cbde-5213-46d3-9dfb-c0f2716e4464-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -490,6 +498,10 @@
           "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"
@@ -510,10 +522,6 @@
           "name": "create_signing_key",
           "value": true
         },
-        {
-          "name": "create_signing_certificate",
-          "value": true
-        },
         {
           "name": "pipeline_ibmcloud_api_key_secret_name",
           "value": "ref:../../inputs/pipeline_ibmcloud_api_key_secret_name"
@@ -552,7 +560,7 @@
         },
         {
           "name": "repo_group",
-          "value": "ref:../../inputs/repo_git_token_secret_value"
+          "value": "ref:../../inputs/repo_group"
         }
       ]
     }