diff --git a/common-dev-assets b/common-dev-assets
index 95f6c1ed..0bb608c5 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 95f6c1ed6360a3350a750313fb94d7781f129aba
+Subproject commit 0bb608c50c07bf9edec01d84e6143c7aff5e9208
diff --git a/ibm_catalog.json b/ibm_catalog.json
index c328460e..76675215 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -207,10 +207,10 @@
               "optional": true,
               "on_by_default": true,
               "input_mapping": [
-                {
-                  "dependency_output": "devops_resource_group_name",
-                  "version_input": "existing_resource_group_name"
-                }
+								{
+									"dependency_output": "devops_resource_group_name",
+									"version_input": "toolchain_resource_group"
+								}
               ]
             }
           ],
@@ -264,7 +264,7 @@
               "required": false
             },
             {
-              "key": "devops_resource_group_name",
+              "key": "toolchain_resource_group",
               "required": false
             },
             {
@@ -492,10 +492,10 @@
               "optional": true,
               "on_by_default": true,
               "input_mapping": [
-                {
-                  "dependency_output": "devops_resource_group_name",
-                  "version_input": "existing_resource_group_name"
-                }
+								{
+									"dependency_output": "devops_resource_group_name",
+									"version_input": "toolchain_resource_group"
+								}
               ]
             }
           ],
@@ -549,7 +549,7 @@
               "required": false
             },
             {
-              "key": "devops_resource_group_name",
+              "key": "toolchain_resource_group",
               "required": false
             },
             {
diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json
index 7dca83b2..f8b8c484 100644
--- a/solutions/basic/stack_definition.json
+++ b/solutions/basic/stack_definition.json
@@ -36,7 +36,7 @@
       "default": "replace"
     },
     {
-      "name": "devops_resource_group_name",
+      "name": "toolchain_resource_group",
       "required": false,
       "type": "string",
       "hidden": false,
@@ -123,7 +123,7 @@
         },
         {
           "name": "toolchain_resource_group",
-          "value": "ref:../../inputs/devops_resource_group_name"
+          "value": "ref:../../inputs/toolchain_resource_group"
         },
         {
           "name": "sm_resource_group",
diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json
index 09498891..274dbd4b 100644
--- a/solutions/standard/stack_definition.json
+++ b/solutions/standard/stack_definition.json
@@ -36,7 +36,7 @@
       "default": "replace"
     },
     {
-      "name": "devops_resource_group_name",
+      "name": "toolchain_resource_group",
       "required": false,
       "type": "string",
       "hidden": false,
@@ -176,7 +176,7 @@
         },
         {
           "name": "toolchain_resource_group",
-          "value": "ref:../../inputs/devops_resource_group_name"
+          "value": "ref:../../inputs/toolchain_resource_group"
         },
         {
           "name": "sm_resource_group",