diff --git a/deploy/CD/api-gateway/.terraform.lock.hcl b/deploy/CD/api-gateway/.terraform.lock.hcl
new file mode 100644
index 00000000..a272fc3c
--- /dev/null
+++ b/deploy/CD/api-gateway/.terraform.lock.hcl
@@ -0,0 +1,63 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
+  version     = "0.15.0"
+  constraints = ">= 0.14.2"
+  hashes = [
+    "h1:28advLdfgEFgPgjN8ZkPoknjGNa1hu+zpRQ4fQsVSis=",
+    "zh:143c1624ee5c2813c32126467fb9c56053bbfcae275d6ce61c7b59c259c4b8e0",
+    "zh:18a5cb24695a1521cb8ee1e488234c337228af1b471b30a284db41c4362c6149",
+    "zh:261595c1bd8105160e8c505d76be5f49d3bd12bb7aa6882ac6315cc5727aec55",
+    "zh:2e8627bf812848fe1b232e4fe91e21eaedc3759f8997ffc5a9f201757627e835",
+    "zh:4a19d909843952b9cbf6b0445c3627d22c5caaa2ad8db1eab2f382d5faff3402",
+    "zh:4e78b3de83b2686c66c2b2e0d8a7c910ed423fd5b7b853bcc0fd05b851c6bd28",
+    "zh:713e43a21a1d3aaddfa0bf841a2cc1e2c06160917bdd443e6eac99b620d668fa",
+    "zh:a36d3e5406f96abaf9a6eb89663b7fa504d0c68521a7334c498525e8018ad7f9",
+    "zh:aa3abf232a49f66031f2a1a032f53604a51d8c9b0a3a297591d7a57949943c40",
+    "zh:b2ccc93024f1ed6e18fd92e199be12ea148383a4f5d8c3ab9e632ae88b0f5263",
+    "zh:b85379c01fc963289203170731880fb89f10047d63c45566750826ad9aff39cb",
+    "zh:c5d59b6fe39f7f4f2c556209906aa9cbb31cc0630d225fb0abd48c6de1089f2e",
+    "zh:c956d630c087fc2ede5967e89249b2477a552185c2d4167292002fc5fd1b380c",
+    "zh:edf41138788f7b16ed572f1fad940ba75f3c7b9a7c06f6876c31bf281de1257a",
+    "zh:f873bbff4c7ae1c6b7c5ba0dd42552526435d9b1bd373b18ea4169e965e4d283",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.1.2"
+  hashes = [
+    "h1:oLnKXeY6OAJhYHr7PFCYt5mFOoZrdEQrwVh0U8KtrYY=",
+    "zh:0daceba867b330d3f8e2c5dc895c4291845a78f31955ce1b91ab2c4d1cd1c10b",
+    "zh:104050099efd30a630741f788f9576b19998e7a09347decbec3da0b21d64ba2d",
+    "zh:173f4ef3fdf0c7e2564a3db0fac560e9f5afdf6afd0b75d6646af6576b122b16",
+    "zh:41d50f975e535f968b3f37170fb07937c15b76d85ba947d0ce5e5ff9530eda65",
+    "zh:51a5038867e5e60757ed7f513dd6a973068241190d158a81d1b69296efb9cb8d",
+    "zh:6432a568e97a5a36cc8aebca5a7e9c879a55d3bc71d0da1ab849ad905f41c0be",
+    "zh:6bac6501394b87138a5e17c9f3a41e46ff7833ad0ba2a96197bb7787e95b641c",
+    "zh:6c0a7f5faacda644b022e7718e53f5868187435be6d000786d1ca05aa6683a25",
+    "zh:74c89de3fa6ef3027efe08f8473c2baeb41b4c6cee250ba7aeb5b64e8c79800d",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:b29eabbf0a5298f0e95a1df214c7cfe06ea9bcf362c63b3ad2f72d85da7d4685",
+    "zh:e891458c7a61e5b964e09616f1a4f87d0471feae1ec04cc51776e7dec1a3abce",
+  ]
+}
+
+provider "registry.terraform.io/philips-software/hsdp" {
+  version     = "0.30.10"
+  constraints = ">= 0.14.8, >= 0.19.5"
+  hashes = [
+    "h1:XTfMEVlCslMPXFJk4oELJ6rQ+huxmuz7wD0t7LpPYbs=",
+    "zh:186831a191684c8f62dca4e09527808e2959d05f67d65cb28cbebe8783a9643e",
+    "zh:1bb46a97336693a0492441cc348a77834aa20100998fd48b178a8322e317c878",
+    "zh:600cea763d58421234de681d6f82f61c205d0373852578bf625b9f450dda70f5",
+    "zh:809798d793630692767cdaa21e98995dc2852e1ac24250b93f3b76a7c4cfe794",
+    "zh:8d703ac14832dd31fa8d7324111c5bc5ec84aac4ae2f1199f0a3c43e6c10070b",
+    "zh:aa43e8a8e355726bf6e118fdc4c484bd1065f4118d42df8d66ac9488206b9488",
+    "zh:b2669cceb7bc9cbdb614cdd677ef634e64bc5f791c719a5a2f254b58efa27508",
+    "zh:b52a34b779af83ae8af5943dae643bb91793381f104fe022f87bc1d0ed276f30",
+    "zh:d2ec6a8ba0f9277f99a93cc64ff8b6f4b74224c116207695489b2ddb8f0964ed",
+    "zh:e02a94406c1f5a9ae20b6af3e4ba871eb7166c9c7f05c6332892a46ae9b42e06",
+    "zh:e6a8e818905c3efd932dc1b8768b90cabcf4a53a1a59613a472833928c471c28",
+  ]
+}
\ No newline at end of file
diff --git a/deploy/CD/api-gateway/terragrunt.hcl b/deploy/CD/api-gateway/terragrunt.hcl
index f6a1ee95..5eb78897 100644
--- a/deploy/CD/api-gateway/terragrunt.hcl
+++ b/deploy/CD/api-gateway/terragrunt.hcl
@@ -10,7 +10,7 @@ inputs = {
 
   proposition_id       = dependency.core.outputs.foundation_envoy_proposition_id
   cf_org               = "client-EDI-SolutionAccelerator"
-  cf_space             = "envoyci"
+  cf_space             = "oauthci"
   cf_deploy_user       = dependency.core.outputs.cf_deploy_user
   cf_deploy_password   = dependency.core.outputs.cf_deploy_password
   cf_domain            = "us-east.philips-healthsuite.com"
diff --git a/deploy/CD/cloudfoundry/.terraform.lock.hcl b/deploy/CD/cloudfoundry/.terraform.lock.hcl
new file mode 100644
index 00000000..644348ef
--- /dev/null
+++ b/deploy/CD/cloudfoundry/.terraform.lock.hcl
@@ -0,0 +1,25 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
+  version     = "0.15.0"
+  constraints = ">= 0.14.2"
+  hashes = [
+    "h1:28advLdfgEFgPgjN8ZkPoknjGNa1hu+zpRQ4fQsVSis=",
+    "zh:143c1624ee5c2813c32126467fb9c56053bbfcae275d6ce61c7b59c259c4b8e0",
+    "zh:18a5cb24695a1521cb8ee1e488234c337228af1b471b30a284db41c4362c6149",
+    "zh:261595c1bd8105160e8c505d76be5f49d3bd12bb7aa6882ac6315cc5727aec55",
+    "zh:2e8627bf812848fe1b232e4fe91e21eaedc3759f8997ffc5a9f201757627e835",
+    "zh:4a19d909843952b9cbf6b0445c3627d22c5caaa2ad8db1eab2f382d5faff3402",
+    "zh:4e78b3de83b2686c66c2b2e0d8a7c910ed423fd5b7b853bcc0fd05b851c6bd28",
+    "zh:713e43a21a1d3aaddfa0bf841a2cc1e2c06160917bdd443e6eac99b620d668fa",
+    "zh:a36d3e5406f96abaf9a6eb89663b7fa504d0c68521a7334c498525e8018ad7f9",
+    "zh:aa3abf232a49f66031f2a1a032f53604a51d8c9b0a3a297591d7a57949943c40",
+    "zh:b2ccc93024f1ed6e18fd92e199be12ea148383a4f5d8c3ab9e632ae88b0f5263",
+    "zh:b85379c01fc963289203170731880fb89f10047d63c45566750826ad9aff39cb",
+    "zh:c5d59b6fe39f7f4f2c556209906aa9cbb31cc0630d225fb0abd48c6de1089f2e",
+    "zh:c956d630c087fc2ede5967e89249b2477a552185c2d4167292002fc5fd1b380c",
+    "zh:edf41138788f7b16ed572f1fad940ba75f3c7b9a7c06f6876c31bf281de1257a",
+    "zh:f873bbff4c7ae1c6b7c5ba0dd42552526435d9b1bd373b18ea4169e965e4d283",
+  ]
+}
\ No newline at end of file
diff --git a/deploy/CD/cloudfoundry/terragrunt.hcl b/deploy/CD/cloudfoundry/terragrunt.hcl
index 09e99930..a367e70d 100644
--- a/deploy/CD/cloudfoundry/terragrunt.hcl
+++ b/deploy/CD/cloudfoundry/terragrunt.hcl
@@ -8,7 +8,7 @@ terraform {
 
 inputs = {
   cf_org          = "client-EDI-SolutionAccelerator"
-  cf_space_name   = "envoyci"
+  cf_space_name   = "oauthci"
   logdrainer_uri  = "${dependency.core.outputs.logdrainer_base_uri}${dependency.core.outputs.logdrainer_uri}"
   redis_plan_name = "redis-development-standalone"
   cf_deploy_user  = dependency.core.outputs.cf_deploy_user
diff --git a/deploy/CD/core/.terraform.lock.hcl b/deploy/CD/core/.terraform.lock.hcl
new file mode 100644
index 00000000..dfc9e277
--- /dev/null
+++ b/deploy/CD/core/.terraform.lock.hcl
@@ -0,0 +1,59 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/azurerm" {
+  version     = "2.99.0"
+  constraints = ">= 2.67.0"
+  hashes = [
+    "h1:aCGPSDzEWQZLeWmUeSnXA6sDHMumbDqOVdSVKVziYoE=",
+    "zh:08d81e72e97351538ab4d15548942217bf0c4d3b79ad3f4c95d8f07f902d2fa6",
+    "zh:11fdfa4f42d6b6f01371f336fea56f28a1db9e7b490c5ca0b352f6bbca5a27f1",
+    "zh:12376e2c4b56b76098d5d713d1a4e07e748a926c4d165f0bd6f52157b1f7a7e9",
+    "zh:31f1cb5b88ed1307625050e3ee7dd9948773f522a3f3bf179195d607de843ea3",
+    "zh:767971161405d38412662a73ea40a422125cdc214c72fbc569bcfbea6e66c366",
+    "zh:973c402c3728b68c980ea537319b703c009b902a981b0067fbc64e04a90e434c",
+    "zh:9ec62a4f82ec1e92bceeff80dd8783f61de0a94665c133f7c7a7a68bda9cdbd6",
+    "zh:bbb3b7e1229c531c4634338e4fc81b28bce58312eb843a931a4420abe42d5b7e",
+    "zh:cbbe02cd410d21476b3a081b5fa74b4f1b3d9d79b00214009028d60e859c19a3",
+    "zh:cc00ecc7617a55543b60a0da1196ea92df48c399bcadbedf04c783e3d47c6e08",
+    "zh:eecb9fd0e7509c7fd4763e546ef0933f125770cbab2b46152416e23d5ec9dd53",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.1.2"
+  hashes = [
+    "h1:oLnKXeY6OAJhYHr7PFCYt5mFOoZrdEQrwVh0U8KtrYY=",
+    "zh:0daceba867b330d3f8e2c5dc895c4291845a78f31955ce1b91ab2c4d1cd1c10b",
+    "zh:104050099efd30a630741f788f9576b19998e7a09347decbec3da0b21d64ba2d",
+    "zh:173f4ef3fdf0c7e2564a3db0fac560e9f5afdf6afd0b75d6646af6576b122b16",
+    "zh:41d50f975e535f968b3f37170fb07937c15b76d85ba947d0ce5e5ff9530eda65",
+    "zh:51a5038867e5e60757ed7f513dd6a973068241190d158a81d1b69296efb9cb8d",
+    "zh:6432a568e97a5a36cc8aebca5a7e9c879a55d3bc71d0da1ab849ad905f41c0be",
+    "zh:6bac6501394b87138a5e17c9f3a41e46ff7833ad0ba2a96197bb7787e95b641c",
+    "zh:6c0a7f5faacda644b022e7718e53f5868187435be6d000786d1ca05aa6683a25",
+    "zh:74c89de3fa6ef3027efe08f8473c2baeb41b4c6cee250ba7aeb5b64e8c79800d",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:b29eabbf0a5298f0e95a1df214c7cfe06ea9bcf362c63b3ad2f72d85da7d4685",
+    "zh:e891458c7a61e5b964e09616f1a4f87d0471feae1ec04cc51776e7dec1a3abce",
+  ]
+}
+
+provider "registry.terraform.io/philips-software/hsdp" {
+  version     = "0.30.10"
+  constraints = ">= 0.19.5"
+  hashes = [
+    "h1:XTfMEVlCslMPXFJk4oELJ6rQ+huxmuz7wD0t7LpPYbs=",
+    "zh:186831a191684c8f62dca4e09527808e2959d05f67d65cb28cbebe8783a9643e",
+    "zh:1bb46a97336693a0492441cc348a77834aa20100998fd48b178a8322e317c878",
+    "zh:600cea763d58421234de681d6f82f61c205d0373852578bf625b9f450dda70f5",
+    "zh:809798d793630692767cdaa21e98995dc2852e1ac24250b93f3b76a7c4cfe794",
+    "zh:8d703ac14832dd31fa8d7324111c5bc5ec84aac4ae2f1199f0a3c43e6c10070b",
+    "zh:aa43e8a8e355726bf6e118fdc4c484bd1065f4118d42df8d66ac9488206b9488",
+    "zh:b2669cceb7bc9cbdb614cdd677ef634e64bc5f791c719a5a2f254b58efa27508",
+    "zh:b52a34b779af83ae8af5943dae643bb91793381f104fe022f87bc1d0ed276f30",
+    "zh:d2ec6a8ba0f9277f99a93cc64ff8b6f4b74224c116207695489b2ddb8f0964ed",
+    "zh:e02a94406c1f5a9ae20b6af3e4ba871eb7166c9c7f05c6332892a46ae9b42e06",
+    "zh:e6a8e818905c3efd932dc1b8768b90cabcf4a53a1a59613a472833928c471c28",
+  ]
+}
\ No newline at end of file
diff --git a/deploy/CD/terragrunt.hcl b/deploy/CD/terragrunt.hcl
index 13e76bd1..3cfc0d50 100644
--- a/deploy/CD/terragrunt.hcl
+++ b/deploy/CD/terragrunt.hcl
@@ -15,7 +15,7 @@ remote_state {
   }
   config = {
     storage_account_name = "foundationcicd"
-    container_name       = "envoyci"
+    container_name       = "oauthci"
     key                  = "${path_relative_to_include()}/terraform.tfstate"
     resource_group_name  = "edi-platform-foundation-cicd"
     subscription_id      = "${local.azure_subscription_id}"
diff --git a/deploy/ci-gated/api-gateway/terragrunt.hcl b/deploy/ci-gated/api-gateway/terragrunt.hcl
index 0eb29603..99a0ea22 100644
--- a/deploy/ci-gated/api-gateway/terragrunt.hcl
+++ b/deploy/ci-gated/api-gateway/terragrunt.hcl
@@ -10,7 +10,7 @@ inputs = {
 
   proposition_id       = dependency.core.outputs.foundation_envoy_proposition_id
   cf_org               = "client-EDI-SolutionAccelerator"
-  cf_space             = "envoyci-gated"
+  cf_space             = "oauthci-gated"
   cf_deploy_user       = dependency.core.outputs.cf_deploy_user
   cf_deploy_password   = dependency.core.outputs.cf_deploy_password
   cf_domain            = "us-east.philips-healthsuite.com"
diff --git a/deploy/ci-gated/cloudfoundry/terragrunt.hcl b/deploy/ci-gated/cloudfoundry/terragrunt.hcl
index 0678906f..fc0c2eb3 100644
--- a/deploy/ci-gated/cloudfoundry/terragrunt.hcl
+++ b/deploy/ci-gated/cloudfoundry/terragrunt.hcl
@@ -8,7 +8,7 @@ terraform {
 
 inputs = {
   cf_org          = "client-EDI-SolutionAccelerator"
-  cf_space_name   = "envoyci-gated"
+  cf_space_name   = "oauthci-gated"
   logdrainer_uri  = "${dependency.core.outputs.logdrainer_base_uri}${dependency.core.outputs.logdrainer_uri}"
   redis_plan_name = "redis-development-standalone"
   cf_deploy_user  = dependency.core.outputs.cf_deploy_user
diff --git a/deploy/ci-gated/terragrunt.hcl b/deploy/ci-gated/terragrunt.hcl
index ccd19899..5407240b 100644
--- a/deploy/ci-gated/terragrunt.hcl
+++ b/deploy/ci-gated/terragrunt.hcl
@@ -15,7 +15,7 @@ remote_state {
   }
   config = {
     storage_account_name = "foundationcicd"
-    container_name       = "envoyci-gated"
+    container_name       = "oauthci-gated"
     key                  = "${path_relative_to_include()}/terraform.tfstate"
     resource_group_name  = "edi-platform-foundation-cicd"
     subscription_id      = "${local.azure_subscription_id}"