diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json
index 8e1e5008..c47937ca 100644
--- a/solutions/basic/stack_definition.json
+++ b/solutions/basic/stack_definition.json
@@ -128,7 +128,7 @@
   "members": [
     {
       "name": "Account Infrastructure Base",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75f26d78-6e7e-4d83-9822-7777ea101706-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e410c7bc-eee6-4dc1-86b5-1ccbd3fdd1fc-global",
       "inputs": [
         {
           "name": "prefix",
@@ -206,7 +206,7 @@
     },
     {
       "name": "Essential Security - Encryption Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7f57ef48-2bb2-4641-8f6e-db27a7eacc38-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global",
       "inputs": [
         {
           "name": "resource_group_name",
@@ -236,7 +236,7 @@
     },
     {
       "name": "Essential Security - Logging Monitoring Activity Tracker",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5036a34b-9925-4d06-932b-c22ce63d3fdf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b209d1d3-08ab-4b63-99ce-8b6bedbb0c5e-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -278,7 +278,7 @@
     },
     {
       "name": "Essential Security - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b5b38d6e-441e-4915-ac00-9a75b442a9f0-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global",
       "inputs": [
         {
           "name": "kms_endpoint_url",
@@ -316,7 +316,7 @@
     },
     {
       "name": "Essential Security - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global",
       "inputs": [
         {
           "name": "prefix",
@@ -362,7 +362,7 @@
     },
     {
       "name": "Essential Security - Security Compliance Center",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b27fc8c7-f6ec-4f98-890d-4f7ccfd37aaf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a54c2019-6cb4-4cb8-8ea5-9eb877cbbe13-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -408,7 +408,7 @@
     },
     {
       "name": "Gen AI - Databases for Elasticsearch",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0166bfff-6cf8-46d1-bb13-e27f7f8ba0db-global",
       "inputs": [
         {
           "name": "use_existing_resource_group",
@@ -540,7 +540,7 @@
     },
     {
       "name": "Workload - Code Engine Projects",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.42a9e379-8a61-4fad-a4c7-09f72a9bfb7c-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.65a474ad-7a19-4219-bdec-eab0dc413404-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -573,7 +573,7 @@
     },
     {
       "name": "Workload - DevSecOps Application Lifecycle Management",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.72e3b0a3-9d6c-4b85-be2c-baed5a5ac732-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9974cbde-5213-46d3-9dfb-c0f2716e4464-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -667,7 +667,7 @@
     },
     {
       "name": "Workload - Sample RAG App Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8fedf6b3-56a4-42e0-87a4-b767eadbe6c8-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a3d36e4-1108-41cd-ba0f-246c2b08f52f-global",
       "inputs": [
         {
           "name": "toolchain_region",
diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json
index 1ba98abe..d890d13d 100644
--- a/solutions/standard/stack_definition.json
+++ b/solutions/standard/stack_definition.json
@@ -128,7 +128,7 @@
   "members": [
     {
       "name": "Account Infrastructure Base",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75f26d78-6e7e-4d83-9822-7777ea101706-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e410c7bc-eee6-4dc1-86b5-1ccbd3fdd1fc-global",
       "inputs": [
         {
           "name": "prefix",
@@ -206,7 +206,7 @@
     },
     {
       "name": "Essential Security - Encryption Key Management",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7f57ef48-2bb2-4641-8f6e-db27a7eacc38-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global",
       "inputs": [
         {
           "name": "resource_group_name",
@@ -236,7 +236,7 @@
     },
     {
       "name": "Essential Security - Logging Monitoring Activity Tracker",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5036a34b-9925-4d06-932b-c22ce63d3fdf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b209d1d3-08ab-4b63-99ce-8b6bedbb0c5e-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -278,7 +278,7 @@
     },
     {
       "name": "Essential Security - Event Notifications",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b5b38d6e-441e-4915-ac00-9a75b442a9f0-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global",
       "inputs": [
         {
           "name": "kms_endpoint_url",
@@ -316,7 +316,7 @@
     },
     {
       "name": "Essential Security - Secrets Manager",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global",
       "inputs": [
         {
           "name": "prefix",
@@ -362,7 +362,7 @@
     },
     {
       "name": "Essential Security - Security Compliance Center",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b27fc8c7-f6ec-4f98-890d-4f7ccfd37aaf-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a54c2019-6cb4-4cb8-8ea5-9eb877cbbe13-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -408,7 +408,7 @@
     },
     {
       "name": "Gen AI - Databases for Elasticsearch",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0166bfff-6cf8-46d1-bb13-e27f7f8ba0db-global",
       "inputs": [
         {
           "name": "use_existing_resource_group",
@@ -548,7 +548,7 @@
     },
     {
       "name": "Workload - Compute Red Hat OpenShift Container Platform on VPC",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.639be978-b7d7-4702-9723-0b638225491b-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.34c51460-8b61-40d0-8ee1-1af58e37832f-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -627,7 +627,7 @@
     },
     {
       "name": "Workload - DevSecOps Application Lifecycle Management",
-      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global",
+      "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.db73948a-5b92-4d65-8b41-e92ba883270f-global",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -717,7 +717,7 @@
     },
     {
       "name": "Workload - Sample RAG App Configuration",
-      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8fedf6b3-56a4-42e0-87a4-b767eadbe6c8-global",
+      "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a3d36e4-1108-41cd-ba0f-246c2b08f52f-global",
       "inputs": [
         {
           "name": "toolchain_region",