diff --git a/terraform/dev/.terraform.lock.hcl b/terraform/dev/.terraform.lock.hcl
index 7cafe530c3..7815f9d812 100644
--- a/terraform/dev/.terraform.lock.hcl
+++ b/terraform/dev/.terraform.lock.hcl
@@ -2,63 +2,82 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
-  version     = "0.51.3"
-  constraints = ">= 0.15.0, ~> 0.51.3"
+  version     = "0.53.1"
+  constraints = ">= 0.15.0, ~> 0.53.1"
   hashes = [
-    "h1:uM0ayyirpxhfyZ9SYxpr7MkS1IUvEbnbsKVajnivoXM=",
-    "zh:011f93f31daefd75e4664ce80462f13f0ee1f93c073b3217730e7a136ca9d544",
-    "zh:0d9078e43a1dcefd62f593e248d7b44478dd75cd70aabdfce92a52abe065f297",
-    "zh:29cc360081f68442ec2f4b1d90f24b9cc3c1017c86e18de62eb8043dbbf7fe8c",
-    "zh:48ea027fd3ecefac3302a58dd61389b086c123d621f094a441aef0c036f9d9f3",
-    "zh:59cbaec857468fe10e91e9f67358bb0c18e91d9dc1bf4386ace42c2a95925889",
-    "zh:8537822684fc2b531ed1c404da25fee2af71f9cfc326bb26b35828d6a7087ed3",
-    "zh:b0d88d3fcd86c5c493de4001e9f1c961e1650a364831380c2aa9ab17551094b7",
-    "zh:cbde14e2c1f84285b0ae28dfb0c495ec6ba503d3abd95774f92492dd26276e14",
-    "zh:cc29ecc864a5f2c1f4d3c6425d595c163ccd202203a40dc78a22f7b8f945efc8",
-    "zh:d3ab24d7b5081b3858053b88222c7652d7432de15a3e037eef0f5d96881f7ef8",
-    "zh:dc125bab081ae478c0afedbeb805238f97fea83e999aa94c2e400e646b845df2",
-    "zh:e12d7ed99ac17b2724f2129db75540c55bbe9e10d067dac8d71216598ce492d1",
-    "zh:fb4f969728f285b5dc460fc8693cfb3f0d4139bda2d389e5de2a0ad91f2009a1",
-    "zh:fca9941b778e7f6ca57d44d698f528438283ab15c1789d8b48be722fe7c03b4b",
-    "zh:fea692d2ed3d4e9da5aebdc54d1c19afe97e07d597b7d5d768224976bc329cc2",
+    "h1:U6Cx0ZA1N8PlKPYOw2uxqWvSvU6zeEwSdmP6RzZ3eXw=",
+    "zh:017a55cdbd444ccf8fe45a3c7cdbc08ddf4f0f13550fcd457c31df9b2cfdb767",
+    "zh:100e9bd10868547193134082427abebad9db6359f6139a882192232e8e6911e3",
+    "zh:34467f6504e8527bd3e18e372d5386a43f2bffd88abf54bb72d51f04ab3e4e23",
+    "zh:3a278f5f71e39d29c7db999e2a34e8135b79cee4f36510b0f2c2dfec47997cf1",
+    "zh:3be1fbe17382c91561b1985d372606d802513d94bae6368e1bafd8dd49494737",
+    "zh:3f12bd7a629d547c706c380d9499ff39eab7b8824a14662aa446f230304bdd3a",
+    "zh:404acaa9ad7f95e83baf2332be54c065c21053bf304e80ac41ae49719462b184",
+    "zh:5ac5f6159d1e0c989e739cf16aa8dede6cee3562a6262bf9f2c6b53f4da866fe",
+    "zh:7a440ee173e69fa153ea4baea47adfca34d7171ffc83e7a1c0ec319d28998cbc",
+    "zh:87e2200bf66443671e249108d1cfa4aa13a31b9fdf445cec88364db8ea6be623",
+    "zh:b1b20b2b751df7765225cee5b01290b06e245e50faa8053495c2ef5ebe316998",
+    "zh:c8ddda9cf7dff40d762ea4dc22941c993ae8e9b2388c8d421f43254a56c98482",
+    "zh:d6ce83f0077a9f6262ffa1f7d777e2b72feac7ea7c8735aa39a5f86b4f3f7084",
+    "zh:d74126b9189ab4ca137ca634eaa25c571491bdd2456ccd0f3276a6d49163e412",
+    "zh:db5d415346e03eac0c5e025f9c10afdebfff35487e8a8383b3c4cd867c422fe2",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/external" {
-  version = "2.3.1"
+  version = "2.3.4"
   hashes = [
-    "h1:bROCw6g5D/3fFnWeJ01L4IrdnJl1ILU8DGDgXCtYzaY=",
-    "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54",
-    "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee",
-    "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd",
-    "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2",
-    "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9",
+    "h1:XWkRZOLKMjci9/JAtE8X8fWOt7A4u+9mgXSUjc4Wuyo=",
+    "zh:037fd82cd86227359bc010672cd174235e2d337601d4686f526d0f53c87447cb",
+    "zh:0ea1db63d6173d01f2fa8eb8989f0809a55135a0d8d424b08ba5dabad73095fa",
+    "zh:17a4d0a306566f2e45778fbac48744b6fd9c958aaa359e79f144c6358cb93af0",
+    "zh:298e5408ab17fd2e90d2cd6d406c6d02344fe610de5b7dae943a58b958e76691",
+    "zh:38ecfd29ee0785fd93164812dcbe0664ebbe5417473f3b2658087ca5a0286ecb",
+    "zh:59f6a6f31acf66f4ea3667a555a70eba5d406c6e6d93c2c641b81d63261eeace",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df",
-    "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e",
-    "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326",
-    "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05",
-    "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8",
-    "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417",
+    "zh:ad0279dfd09d713db0c18469f585e58d04748ca72d9ada83883492e0dd13bd58",
+    "zh:c69f66fd21f5e2c8ecf7ca68d9091c40f19ad913aef21e3ce23836e91b8cbb5f",
+    "zh:d4a56f8c48aa86fc8e0c233d56850f5783f322d6336f3bf1916e293246b6b5d4",
+    "zh:f2b394ebd4af33f343835517e80fc876f79361f4688220833bc3c77655dd2202",
+    "zh:f31982f29f12834e5d21e010856eddd19d59cd8f449adf470655bfd19354377e",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/null" {
+  version = "3.2.3"
+  hashes = [
+    "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=",
+    "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2",
+    "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d",
+    "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3",
+    "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f",
+    "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301",
+    "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670",
+    "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed",
+    "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65",
+    "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd",
+    "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/random" {
-  version = "3.5.1"
+  version = "3.6.3"
   hashes = [
-    "h1:VSnd9ZIPyfKHOObuQCaKfnjIHRtR7qTw19Rz8tJxm+k=",
-    "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64",
-    "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d",
-    "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831",
-    "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3",
-    "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f",
+    "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b",
-    "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2",
-    "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865",
-    "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03",
-    "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602",
-    "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
   ]
 }
 
@@ -83,3 +102,28 @@ provider "registry.terraform.io/kreuzwerker/docker" {
     "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
   ]
 }
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version = "3.52.0"
+  hashes = [
+    "h1:Ysy1sQzitKtM+FRpkhVjNjkcozm2e+niJJip6ID4zP8=",
+    "zh:05f00cab1192243fdeb6fe44e1a81cfec4ddbb5027644343ba8ffa42d338c75c",
+    "zh:10b9fc63af1ed44078deee434492c3c1a6803e946c7c7c40635f37aadfada83f",
+    "zh:14dc4f8772b8abc4c4e771f44fae896c694a0097545f4e493d4a69a6b713e3db",
+    "zh:35bebb6a26036c331f5e9d67f97fad80f9ec7ac6634617e57b1a1b4eb0ab3c2f",
+    "zh:3d82b966e832d556ee28be2b88eae0909c07c18c2714c6e3c901f048467eafa8",
+    "zh:40c167866e89832412665f1125d278221fe33a239bca3a401bea2cf34b9ce66d",
+    "zh:5f8c027d264e9ed49abbab4ff1ef08ae1fdf47fadf3e50bed212ab3a985bd6c5",
+    "zh:67d9f53f4109378c494c1478047be34b6b0c2b22add07ba5c26b9d4db77cce67",
+    "zh:838074a601656e0868b64864d739bb878250a41dc79b67499ae8563439e34b73",
+    "zh:99ba546fdbc428b0a667ffc0a6f19609dd5d859a6c9d4b01e80cdbf5ea054e9d",
+    "zh:ab0da597e428f69fbd2cee8d6be03884893358965974d7d7cb838c4b352b960a",
+    "zh:ab78d74fc5bf05fc9764da864315f572dbc63c45e17bc665a668d1ae82a08d3c",
+    "zh:baffd3a7384622100d5a01d0e520910314f892fa30410e4294a30db76bdee825",
+    "zh:c2400a8536c6fc7983207773eb98e757a0074f9daa0e13e1e661de5788fb134f",
+    "zh:d576df69c43e85a7bba817b7cc38fd1b8c44ddb747be7ab3705315866fd29f47",
+    "zh:d9d8f688ecc32c312bc6bf0619aef2ad1023138e52b0c8b7dd2d06901dade2e9",
+    "zh:f9f24572bd76b2b5d9de780db656228bea12ea1f3d1caea2879b171ce5c385f4",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
diff --git a/terraform/dev/dev.tf b/terraform/dev/dev.tf
index 82a8b4915f..ccc5d10a8b 100644
--- a/terraform/dev/dev.tf
+++ b/terraform/dev/dev.tf
@@ -15,7 +15,6 @@ module "dev" {
   clamav_instances      = 1
   clamav_memory         = 2048
   clamav_fs_instances   = 1
-  recursive_delete      = true
   json_params = jsonencode(
     {
       "storage" : 50,
@@ -24,7 +23,7 @@ module "dev" {
 }
 
 module "dev-backups-bucket" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
 
   cf_org_name   = var.cf_org_name
   cf_space_name = "dev"
diff --git a/terraform/dev/init.sh b/terraform/dev/init.sh
index a346e0b148..40268c41f2 100755
--- a/terraform/dev/init.sh
+++ b/terraform/dev/init.sh
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-  
\ No newline at end of file
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/dev/providers-managed.tf b/terraform/dev/providers-managed.tf
index a6d4ffe122..c9a41eaec1 100644
--- a/terraform/dev/providers-managed.tf
+++ b/terraform/dev/providers-managed.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
\ No newline at end of file
+}
diff --git a/terraform/meta/.terraform.lock.hcl b/terraform/meta/.terraform.lock.hcl
index 14ef7a4151..960606908a 100644
--- a/terraform/meta/.terraform.lock.hcl
+++ b/terraform/meta/.terraform.lock.hcl
@@ -2,44 +2,44 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
-  version     = "0.51.3"
-  constraints = "~> 0.51.3"
+  version     = "0.53.1"
+  constraints = ">= 0.15.0, ~> 0.53.1"
   hashes = [
-    "h1:uM0ayyirpxhfyZ9SYxpr7MkS1IUvEbnbsKVajnivoXM=",
-    "zh:011f93f31daefd75e4664ce80462f13f0ee1f93c073b3217730e7a136ca9d544",
-    "zh:0d9078e43a1dcefd62f593e248d7b44478dd75cd70aabdfce92a52abe065f297",
-    "zh:29cc360081f68442ec2f4b1d90f24b9cc3c1017c86e18de62eb8043dbbf7fe8c",
-    "zh:48ea027fd3ecefac3302a58dd61389b086c123d621f094a441aef0c036f9d9f3",
-    "zh:59cbaec857468fe10e91e9f67358bb0c18e91d9dc1bf4386ace42c2a95925889",
-    "zh:8537822684fc2b531ed1c404da25fee2af71f9cfc326bb26b35828d6a7087ed3",
-    "zh:b0d88d3fcd86c5c493de4001e9f1c961e1650a364831380c2aa9ab17551094b7",
-    "zh:cbde14e2c1f84285b0ae28dfb0c495ec6ba503d3abd95774f92492dd26276e14",
-    "zh:cc29ecc864a5f2c1f4d3c6425d595c163ccd202203a40dc78a22f7b8f945efc8",
-    "zh:d3ab24d7b5081b3858053b88222c7652d7432de15a3e037eef0f5d96881f7ef8",
-    "zh:dc125bab081ae478c0afedbeb805238f97fea83e999aa94c2e400e646b845df2",
-    "zh:e12d7ed99ac17b2724f2129db75540c55bbe9e10d067dac8d71216598ce492d1",
-    "zh:fb4f969728f285b5dc460fc8693cfb3f0d4139bda2d389e5de2a0ad91f2009a1",
-    "zh:fca9941b778e7f6ca57d44d698f528438283ab15c1789d8b48be722fe7c03b4b",
-    "zh:fea692d2ed3d4e9da5aebdc54d1c19afe97e07d597b7d5d768224976bc329cc2",
+    "h1:U6Cx0ZA1N8PlKPYOw2uxqWvSvU6zeEwSdmP6RzZ3eXw=",
+    "zh:017a55cdbd444ccf8fe45a3c7cdbc08ddf4f0f13550fcd457c31df9b2cfdb767",
+    "zh:100e9bd10868547193134082427abebad9db6359f6139a882192232e8e6911e3",
+    "zh:34467f6504e8527bd3e18e372d5386a43f2bffd88abf54bb72d51f04ab3e4e23",
+    "zh:3a278f5f71e39d29c7db999e2a34e8135b79cee4f36510b0f2c2dfec47997cf1",
+    "zh:3be1fbe17382c91561b1985d372606d802513d94bae6368e1bafd8dd49494737",
+    "zh:3f12bd7a629d547c706c380d9499ff39eab7b8824a14662aa446f230304bdd3a",
+    "zh:404acaa9ad7f95e83baf2332be54c065c21053bf304e80ac41ae49719462b184",
+    "zh:5ac5f6159d1e0c989e739cf16aa8dede6cee3562a6262bf9f2c6b53f4da866fe",
+    "zh:7a440ee173e69fa153ea4baea47adfca34d7171ffc83e7a1c0ec319d28998cbc",
+    "zh:87e2200bf66443671e249108d1cfa4aa13a31b9fdf445cec88364db8ea6be623",
+    "zh:b1b20b2b751df7765225cee5b01290b06e245e50faa8053495c2ef5ebe316998",
+    "zh:c8ddda9cf7dff40d762ea4dc22941c993ae8e9b2388c8d421f43254a56c98482",
+    "zh:d6ce83f0077a9f6262ffa1f7d777e2b72feac7ea7c8735aa39a5f86b4f3f7084",
+    "zh:d74126b9189ab4ca137ca634eaa25c571491bdd2456ccd0f3276a6d49163e412",
+    "zh:db5d415346e03eac0c5e025f9c10afdebfff35487e8a8383b3c4cd867c422fe2",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/local" {
-  version = "2.4.0"
+  version = "2.5.2"
   hashes = [
-    "h1:R97FTYETo88sT2VHfMgkPU3lzCsZLunPftjSI5vfKe8=",
-    "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9",
-    "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf",
-    "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732",
+    "h1:JlMZD6nYqJ8sSrFfEAH0Vk/SL8WLZRmFaMUF9PJK5wM=",
+    "zh:136299545178ce281c56f36965bf91c35407c11897f7082b3b983d86cb79b511",
+    "zh:3b4486858aa9cb8163378722b642c57c529b6c64bfbfc9461d940a84cd66ebea",
+    "zh:4855ee628ead847741aa4f4fc9bed50cfdbf197f2912775dd9fe7bc43fa077c0",
+    "zh:4b8cd2583d1edcac4011caafe8afb7a95e8110a607a1d5fb87d921178074a69b",
+    "zh:52084ddaff8c8cd3f9e7bcb7ce4dc1eab00602912c96da43c29b4762dc376038",
+    "zh:71562d330d3f92d79b2952ffdda0dad167e952e46200c767dd30c6af8d7c0ed3",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:82a803f2f484c8b766e2e9c32343e9c89b91997b9f8d2697f9f3837f62926b35",
-    "zh:9708a4e40d6cc4b8afd1352e5186e6e1502f6ae599867c120967aebe9d90ed04",
-    "zh:973f65ce0d67c585f4ec250c1e634c9b22d9c4288b484ee2a871d7fa1e317406",
-    "zh:c8fa0f98f9316e4cfef082aa9b785ba16e36ff754d6aba8b456dab9500e671c6",
-    "zh:cfa5342a5f5188b20db246c73ac823918c189468e1382cb3c48a9c0c08fc5bf7",
-    "zh:e0e2b477c7e899c63b06b38cd8684a893d834d6d0b5e9b033cedc06dd7ffe9e2",
-    "zh:f62d7d05ea1ee566f732505200ab38d94315a4add27947a60afa29860822d3fc",
-    "zh:fa7ce69dde358e172bd719014ad637634bbdabc49363104f4fca759b4b73f2ce",
+    "zh:805f81ade06ff68fa8b908d31892eaed5c180ae031c77ad35f82cb7a74b97cf4",
+    "zh:8b6b3ebeaaa8e38dd04e56996abe80db9be6f4c1df75ac3cccc77642899bd464",
+    "zh:ad07750576b99248037b897de71113cc19b1a8d0bc235eb99173cc83d0de3b1b",
+    "zh:b9f1c3bfadb74068f5c205292badb0661e17ac05eb23bfe8bd809691e4583d0e",
+    "zh:cc4cbcd67414fefb111c1bf7ab0bc4beb8c0b553d01719ad17de9a047adff4d1",
   ]
 }
 
diff --git a/terraform/meta/bootstrap-env/providers.tf b/terraform/meta/bootstrap-env/providers.tf
index 0ac903d2e7..83f974bc1c 100644
--- a/terraform/meta/bootstrap-env/providers.tf
+++ b/terraform/meta/bootstrap-env/providers.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
     github = {
       source  = "integrations/github"
       version = "~>5.12.0"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/terraform/meta/bootstrap-env/space.tf b/terraform/meta/bootstrap-env/space.tf
index 7d5a307c7e..da2a2e0bf0 100644
--- a/terraform/meta/bootstrap-env/space.tf
+++ b/terraform/meta/bootstrap-env/space.tf
@@ -10,9 +10,10 @@ data "cloudfoundry_asg" "asgs" {
 
 # Ensure the space exists and is configured as expected
 resource "cloudfoundry_space" "space" {
-  name      = var.name
-  org       = data.cloudfoundry_org.org.id
-  allow_ssh = var.allow_ssh
+  name                     = var.name
+  org                      = data.cloudfoundry_org.org.id
+  allow_ssh                = var.allow_ssh
+  delete_recursive_allowed = false
 }
 
 resource "cloudfoundry_space_asgs" "space_asgs" {
diff --git a/terraform/meta/bootstrap-env/templates/init.sh-template b/terraform/meta/bootstrap-env/templates/init.sh-template
index a346e0b148..40268c41f2 100644
--- a/terraform/meta/bootstrap-env/templates/init.sh-template
+++ b/terraform/meta/bootstrap-env/templates/init.sh-template
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-  
\ No newline at end of file
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/meta/bootstrap-env/templates/providers.tf-template b/terraform/meta/bootstrap-env/templates/providers.tf-template
index a6d4ffe122..c9a41eaec1 100644
--- a/terraform/meta/bootstrap-env/templates/providers.tf-template
+++ b/terraform/meta/bootstrap-env/templates/providers.tf-template
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
\ No newline at end of file
+}
diff --git a/terraform/meta/bootstrap/.terraform.lock.hcl b/terraform/meta/bootstrap/.terraform.lock.hcl
index efd763bb6e..fca37b417f 100644
--- a/terraform/meta/bootstrap/.terraform.lock.hcl
+++ b/terraform/meta/bootstrap/.terraform.lock.hcl
@@ -2,24 +2,43 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
-  version     = "0.50.7"
-  constraints = ">= 0.15.0, ~> 0.50.2"
+  version     = "0.53.1"
+  constraints = ">= 0.53.1, ~> 0.53.1"
   hashes = [
-    "h1:dKYm6HNHrDEEb6faRE7xUoZEjD6fYsw2uG+avbdGMAI=",
-    "zh:0679ed5d688e2fbe21c8ffff285189e93c005535ebd00aecc27139aa7cde379a",
-    "zh:14a98148b838ea690bab3baeeb7eaecbd46b611c0147b09b07a4e08e0384c5c8",
-    "zh:1a3aae7823a1a84590dc9479c15e95e026066c99111bf88f16c618a4ff750a70",
-    "zh:1d04452eac30fea79d05d2232b60deeedc55552f88d1d03827d61cc1771feea0",
-    "zh:530cec74148a33f75d502cb7579af711c542aa36f9bcb011e368a08f00f578b0",
-    "zh:563566b53ccec3e21b880552df2d442cdf56d67c15609a2bdc1faf2e2f34f240",
-    "zh:5d8024966b3b16c0404cbbce37aa828a467ef453888c8de4c383a9ccac8b111b",
-    "zh:6a65fd3ee84a4db767cba694f239c3b2fe69c6c065441b2acac7c4b35ad2b840",
-    "zh:77b94f6bbd8d596071610ee72b040333cd25552c96bd4549707452ca052d0bdd",
-    "zh:78b813fd523c885a696dfbe4f23d49eb67b1231dc148d55e99508e8897c0920b",
-    "zh:97431d2f85f2883333fa895eb33483a2427fa0dcb4cfef0ae3a1218a81101659",
-    "zh:9a378e0ff3e6499f2bc510060909a7f8e2a488d9a98d273c540dbcbc190a3904",
-    "zh:a8e87b634d0f8465884fedbff32dcd5481874b77e3688fd5c1cb790ea3fbf46d",
-    "zh:ca549e49147e9e0a26607bc2c4641b29f09b6133f69e897c4958188925e588ea",
-    "zh:fdd35b648ca2a979133e1d42c8791f22bd3ec4dc55533768c4407f8a039ed09d",
+    "h1:U6Cx0ZA1N8PlKPYOw2uxqWvSvU6zeEwSdmP6RzZ3eXw=",
+    "zh:017a55cdbd444ccf8fe45a3c7cdbc08ddf4f0f13550fcd457c31df9b2cfdb767",
+    "zh:100e9bd10868547193134082427abebad9db6359f6139a882192232e8e6911e3",
+    "zh:34467f6504e8527bd3e18e372d5386a43f2bffd88abf54bb72d51f04ab3e4e23",
+    "zh:3a278f5f71e39d29c7db999e2a34e8135b79cee4f36510b0f2c2dfec47997cf1",
+    "zh:3be1fbe17382c91561b1985d372606d802513d94bae6368e1bafd8dd49494737",
+    "zh:3f12bd7a629d547c706c380d9499ff39eab7b8824a14662aa446f230304bdd3a",
+    "zh:404acaa9ad7f95e83baf2332be54c065c21053bf304e80ac41ae49719462b184",
+    "zh:5ac5f6159d1e0c989e739cf16aa8dede6cee3562a6262bf9f2c6b53f4da866fe",
+    "zh:7a440ee173e69fa153ea4baea47adfca34d7171ffc83e7a1c0ec319d28998cbc",
+    "zh:87e2200bf66443671e249108d1cfa4aa13a31b9fdf445cec88364db8ea6be623",
+    "zh:b1b20b2b751df7765225cee5b01290b06e245e50faa8053495c2ef5ebe316998",
+    "zh:c8ddda9cf7dff40d762ea4dc22941c993ae8e9b2388c8d421f43254a56c98482",
+    "zh:d6ce83f0077a9f6262ffa1f7d777e2b72feac7ea7c8735aa39a5f86b4f3f7084",
+    "zh:d74126b9189ab4ca137ca634eaa25c571491bdd2456ccd0f3276a6d49163e412",
+    "zh:db5d415346e03eac0c5e025f9c10afdebfff35487e8a8383b3c4cd867c422fe2",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/local" {
+  version = "2.5.2"
+  hashes = [
+    "h1:JlMZD6nYqJ8sSrFfEAH0Vk/SL8WLZRmFaMUF9PJK5wM=",
+    "zh:136299545178ce281c56f36965bf91c35407c11897f7082b3b983d86cb79b511",
+    "zh:3b4486858aa9cb8163378722b642c57c529b6c64bfbfc9461d940a84cd66ebea",
+    "zh:4855ee628ead847741aa4f4fc9bed50cfdbf197f2912775dd9fe7bc43fa077c0",
+    "zh:4b8cd2583d1edcac4011caafe8afb7a95e8110a607a1d5fb87d921178074a69b",
+    "zh:52084ddaff8c8cd3f9e7bcb7ce4dc1eab00602912c96da43c29b4762dc376038",
+    "zh:71562d330d3f92d79b2952ffdda0dad167e952e46200c767dd30c6af8d7c0ed3",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:805f81ade06ff68fa8b908d31892eaed5c180ae031c77ad35f82cb7a74b97cf4",
+    "zh:8b6b3ebeaaa8e38dd04e56996abe80db9be6f4c1df75ac3cccc77642899bd464",
+    "zh:ad07750576b99248037b897de71113cc19b1a8d0bc235eb99173cc83d0de3b1b",
+    "zh:b9f1c3bfadb74068f5c205292badb0661e17ac05eb23bfe8bd809691e4583d0e",
+    "zh:cc4cbcd67414fefb111c1bf7ab0bc4beb8c0b553d01719ad17de9a047adff4d1",
   ]
 }
diff --git a/terraform/meta/bootstrap/providers.tf b/terraform/meta/bootstrap/providers.tf
index b01f40e94d..d6067feb83 100644
--- a/terraform/meta/bootstrap/providers.tf
+++ b/terraform/meta/bootstrap/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.50.2"
+      version = "~>0.53.1"
     }
   }
 }
@@ -13,4 +13,4 @@ provider "cloudfoundry" {
   user         = var.cf_user
   password     = var.cf_password
   app_logs_max = 30
-}
\ No newline at end of file
+}
diff --git a/terraform/meta/init.sh b/terraform/meta/init.sh
index 79a5bdd6c9..f74444fc47 100755
--- a/terraform/meta/init.sh
+++ b/terraform/meta/init.sh
@@ -3,4 +3,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/meta/meta.tf b/terraform/meta/meta.tf
index 09affc85de..e7baea00c3 100644
--- a/terraform/meta/meta.tf
+++ b/terraform/meta/meta.tf
@@ -41,7 +41,7 @@ locals {
 }
 
 module "s3-backups" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
 
   cf_org_name = local.org_name
   # TODO: This should be the key for the first space that says "is_production =
diff --git a/terraform/meta/providers.tf b/terraform/meta/providers.tf
index b6cbdf48f0..a76a4bf7f3 100644
--- a/terraform/meta/providers.tf
+++ b/terraform/meta/providers.tf
@@ -3,19 +3,19 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
   backend "s3" {
     # We are using "partial configuration" here. The rest of the backend
     # parameters are provided when you initialize terraform, eg run:
-    # 
+    #
     #   terraform init \
     #    --backend-config=../shared/config/backend.tfvars \
     #    --backend-config=key=terraform-state-$(basename $(pwd))
     #
-    # For more info, see: 
+    # For more info, see:
     # https://developer.hashicorp.com/terraform/language/settings/backends/configuration#partial-configuration
     encrypt = "true"
   }
@@ -25,4 +25,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
\ No newline at end of file
+}
diff --git a/terraform/preview/.terraform.lock.hcl b/terraform/preview/.terraform.lock.hcl
index 7cafe530c3..7815f9d812 100644
--- a/terraform/preview/.terraform.lock.hcl
+++ b/terraform/preview/.terraform.lock.hcl
@@ -2,63 +2,82 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
-  version     = "0.51.3"
-  constraints = ">= 0.15.0, ~> 0.51.3"
+  version     = "0.53.1"
+  constraints = ">= 0.15.0, ~> 0.53.1"
   hashes = [
-    "h1:uM0ayyirpxhfyZ9SYxpr7MkS1IUvEbnbsKVajnivoXM=",
-    "zh:011f93f31daefd75e4664ce80462f13f0ee1f93c073b3217730e7a136ca9d544",
-    "zh:0d9078e43a1dcefd62f593e248d7b44478dd75cd70aabdfce92a52abe065f297",
-    "zh:29cc360081f68442ec2f4b1d90f24b9cc3c1017c86e18de62eb8043dbbf7fe8c",
-    "zh:48ea027fd3ecefac3302a58dd61389b086c123d621f094a441aef0c036f9d9f3",
-    "zh:59cbaec857468fe10e91e9f67358bb0c18e91d9dc1bf4386ace42c2a95925889",
-    "zh:8537822684fc2b531ed1c404da25fee2af71f9cfc326bb26b35828d6a7087ed3",
-    "zh:b0d88d3fcd86c5c493de4001e9f1c961e1650a364831380c2aa9ab17551094b7",
-    "zh:cbde14e2c1f84285b0ae28dfb0c495ec6ba503d3abd95774f92492dd26276e14",
-    "zh:cc29ecc864a5f2c1f4d3c6425d595c163ccd202203a40dc78a22f7b8f945efc8",
-    "zh:d3ab24d7b5081b3858053b88222c7652d7432de15a3e037eef0f5d96881f7ef8",
-    "zh:dc125bab081ae478c0afedbeb805238f97fea83e999aa94c2e400e646b845df2",
-    "zh:e12d7ed99ac17b2724f2129db75540c55bbe9e10d067dac8d71216598ce492d1",
-    "zh:fb4f969728f285b5dc460fc8693cfb3f0d4139bda2d389e5de2a0ad91f2009a1",
-    "zh:fca9941b778e7f6ca57d44d698f528438283ab15c1789d8b48be722fe7c03b4b",
-    "zh:fea692d2ed3d4e9da5aebdc54d1c19afe97e07d597b7d5d768224976bc329cc2",
+    "h1:U6Cx0ZA1N8PlKPYOw2uxqWvSvU6zeEwSdmP6RzZ3eXw=",
+    "zh:017a55cdbd444ccf8fe45a3c7cdbc08ddf4f0f13550fcd457c31df9b2cfdb767",
+    "zh:100e9bd10868547193134082427abebad9db6359f6139a882192232e8e6911e3",
+    "zh:34467f6504e8527bd3e18e372d5386a43f2bffd88abf54bb72d51f04ab3e4e23",
+    "zh:3a278f5f71e39d29c7db999e2a34e8135b79cee4f36510b0f2c2dfec47997cf1",
+    "zh:3be1fbe17382c91561b1985d372606d802513d94bae6368e1bafd8dd49494737",
+    "zh:3f12bd7a629d547c706c380d9499ff39eab7b8824a14662aa446f230304bdd3a",
+    "zh:404acaa9ad7f95e83baf2332be54c065c21053bf304e80ac41ae49719462b184",
+    "zh:5ac5f6159d1e0c989e739cf16aa8dede6cee3562a6262bf9f2c6b53f4da866fe",
+    "zh:7a440ee173e69fa153ea4baea47adfca34d7171ffc83e7a1c0ec319d28998cbc",
+    "zh:87e2200bf66443671e249108d1cfa4aa13a31b9fdf445cec88364db8ea6be623",
+    "zh:b1b20b2b751df7765225cee5b01290b06e245e50faa8053495c2ef5ebe316998",
+    "zh:c8ddda9cf7dff40d762ea4dc22941c993ae8e9b2388c8d421f43254a56c98482",
+    "zh:d6ce83f0077a9f6262ffa1f7d777e2b72feac7ea7c8735aa39a5f86b4f3f7084",
+    "zh:d74126b9189ab4ca137ca634eaa25c571491bdd2456ccd0f3276a6d49163e412",
+    "zh:db5d415346e03eac0c5e025f9c10afdebfff35487e8a8383b3c4cd867c422fe2",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/external" {
-  version = "2.3.1"
+  version = "2.3.4"
   hashes = [
-    "h1:bROCw6g5D/3fFnWeJ01L4IrdnJl1ILU8DGDgXCtYzaY=",
-    "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54",
-    "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee",
-    "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd",
-    "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2",
-    "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9",
+    "h1:XWkRZOLKMjci9/JAtE8X8fWOt7A4u+9mgXSUjc4Wuyo=",
+    "zh:037fd82cd86227359bc010672cd174235e2d337601d4686f526d0f53c87447cb",
+    "zh:0ea1db63d6173d01f2fa8eb8989f0809a55135a0d8d424b08ba5dabad73095fa",
+    "zh:17a4d0a306566f2e45778fbac48744b6fd9c958aaa359e79f144c6358cb93af0",
+    "zh:298e5408ab17fd2e90d2cd6d406c6d02344fe610de5b7dae943a58b958e76691",
+    "zh:38ecfd29ee0785fd93164812dcbe0664ebbe5417473f3b2658087ca5a0286ecb",
+    "zh:59f6a6f31acf66f4ea3667a555a70eba5d406c6e6d93c2c641b81d63261eeace",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df",
-    "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e",
-    "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326",
-    "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05",
-    "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8",
-    "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417",
+    "zh:ad0279dfd09d713db0c18469f585e58d04748ca72d9ada83883492e0dd13bd58",
+    "zh:c69f66fd21f5e2c8ecf7ca68d9091c40f19ad913aef21e3ce23836e91b8cbb5f",
+    "zh:d4a56f8c48aa86fc8e0c233d56850f5783f322d6336f3bf1916e293246b6b5d4",
+    "zh:f2b394ebd4af33f343835517e80fc876f79361f4688220833bc3c77655dd2202",
+    "zh:f31982f29f12834e5d21e010856eddd19d59cd8f449adf470655bfd19354377e",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/null" {
+  version = "3.2.3"
+  hashes = [
+    "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=",
+    "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2",
+    "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d",
+    "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3",
+    "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f",
+    "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301",
+    "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670",
+    "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed",
+    "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65",
+    "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd",
+    "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/random" {
-  version = "3.5.1"
+  version = "3.6.3"
   hashes = [
-    "h1:VSnd9ZIPyfKHOObuQCaKfnjIHRtR7qTw19Rz8tJxm+k=",
-    "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64",
-    "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d",
-    "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831",
-    "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3",
-    "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f",
+    "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b",
-    "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2",
-    "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865",
-    "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03",
-    "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602",
-    "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
   ]
 }
 
@@ -83,3 +102,28 @@ provider "registry.terraform.io/kreuzwerker/docker" {
     "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
   ]
 }
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version = "3.52.0"
+  hashes = [
+    "h1:Ysy1sQzitKtM+FRpkhVjNjkcozm2e+niJJip6ID4zP8=",
+    "zh:05f00cab1192243fdeb6fe44e1a81cfec4ddbb5027644343ba8ffa42d338c75c",
+    "zh:10b9fc63af1ed44078deee434492c3c1a6803e946c7c7c40635f37aadfada83f",
+    "zh:14dc4f8772b8abc4c4e771f44fae896c694a0097545f4e493d4a69a6b713e3db",
+    "zh:35bebb6a26036c331f5e9d67f97fad80f9ec7ac6634617e57b1a1b4eb0ab3c2f",
+    "zh:3d82b966e832d556ee28be2b88eae0909c07c18c2714c6e3c901f048467eafa8",
+    "zh:40c167866e89832412665f1125d278221fe33a239bca3a401bea2cf34b9ce66d",
+    "zh:5f8c027d264e9ed49abbab4ff1ef08ae1fdf47fadf3e50bed212ab3a985bd6c5",
+    "zh:67d9f53f4109378c494c1478047be34b6b0c2b22add07ba5c26b9d4db77cce67",
+    "zh:838074a601656e0868b64864d739bb878250a41dc79b67499ae8563439e34b73",
+    "zh:99ba546fdbc428b0a667ffc0a6f19609dd5d859a6c9d4b01e80cdbf5ea054e9d",
+    "zh:ab0da597e428f69fbd2cee8d6be03884893358965974d7d7cb838c4b352b960a",
+    "zh:ab78d74fc5bf05fc9764da864315f572dbc63c45e17bc665a668d1ae82a08d3c",
+    "zh:baffd3a7384622100d5a01d0e520910314f892fa30410e4294a30db76bdee825",
+    "zh:c2400a8536c6fc7983207773eb98e757a0074f9daa0e13e1e661de5788fb134f",
+    "zh:d576df69c43e85a7bba817b7cc38fd1b8c44ddb747be7ab3705315866fd29f47",
+    "zh:d9d8f688ecc32c312bc6bf0619aef2ad1023138e52b0c8b7dd2d06901dade2e9",
+    "zh:f9f24572bd76b2b5d9de780db656228bea12ea1f3d1caea2879b171ce5c385f4",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
diff --git a/terraform/preview/init.sh b/terraform/preview/init.sh
index a346e0b148..40268c41f2 100755
--- a/terraform/preview/init.sh
+++ b/terraform/preview/init.sh
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-  
\ No newline at end of file
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/preview/preview.tf b/terraform/preview/preview.tf
index 5847c318fb..8774e26295 100644
--- a/terraform/preview/preview.tf
+++ b/terraform/preview/preview.tf
@@ -15,7 +15,6 @@ module "preview" {
   clamav_instances      = 1
   clamav_memory         = 2048
   clamav_fs_instances   = 1
-  recursive_delete      = true
   json_params = jsonencode(
     {
       "storage" : 50,
@@ -24,7 +23,7 @@ module "preview" {
 }
 
 module "preview-backups-bucket" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
 
   cf_org_name   = var.cf_org_name
   cf_space_name = "preview"
diff --git a/terraform/preview/providers-managed.tf b/terraform/preview/providers-managed.tf
index a6d4ffe122..c9a41eaec1 100644
--- a/terraform/preview/providers-managed.tf
+++ b/terraform/preview/providers-managed.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
\ No newline at end of file
+}
diff --git a/terraform/production/.terraform.lock.hcl b/terraform/production/.terraform.lock.hcl
index 7cafe530c3..7815f9d812 100644
--- a/terraform/production/.terraform.lock.hcl
+++ b/terraform/production/.terraform.lock.hcl
@@ -2,63 +2,82 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
-  version     = "0.51.3"
-  constraints = ">= 0.15.0, ~> 0.51.3"
+  version     = "0.53.1"
+  constraints = ">= 0.15.0, ~> 0.53.1"
   hashes = [
-    "h1:uM0ayyirpxhfyZ9SYxpr7MkS1IUvEbnbsKVajnivoXM=",
-    "zh:011f93f31daefd75e4664ce80462f13f0ee1f93c073b3217730e7a136ca9d544",
-    "zh:0d9078e43a1dcefd62f593e248d7b44478dd75cd70aabdfce92a52abe065f297",
-    "zh:29cc360081f68442ec2f4b1d90f24b9cc3c1017c86e18de62eb8043dbbf7fe8c",
-    "zh:48ea027fd3ecefac3302a58dd61389b086c123d621f094a441aef0c036f9d9f3",
-    "zh:59cbaec857468fe10e91e9f67358bb0c18e91d9dc1bf4386ace42c2a95925889",
-    "zh:8537822684fc2b531ed1c404da25fee2af71f9cfc326bb26b35828d6a7087ed3",
-    "zh:b0d88d3fcd86c5c493de4001e9f1c961e1650a364831380c2aa9ab17551094b7",
-    "zh:cbde14e2c1f84285b0ae28dfb0c495ec6ba503d3abd95774f92492dd26276e14",
-    "zh:cc29ecc864a5f2c1f4d3c6425d595c163ccd202203a40dc78a22f7b8f945efc8",
-    "zh:d3ab24d7b5081b3858053b88222c7652d7432de15a3e037eef0f5d96881f7ef8",
-    "zh:dc125bab081ae478c0afedbeb805238f97fea83e999aa94c2e400e646b845df2",
-    "zh:e12d7ed99ac17b2724f2129db75540c55bbe9e10d067dac8d71216598ce492d1",
-    "zh:fb4f969728f285b5dc460fc8693cfb3f0d4139bda2d389e5de2a0ad91f2009a1",
-    "zh:fca9941b778e7f6ca57d44d698f528438283ab15c1789d8b48be722fe7c03b4b",
-    "zh:fea692d2ed3d4e9da5aebdc54d1c19afe97e07d597b7d5d768224976bc329cc2",
+    "h1:U6Cx0ZA1N8PlKPYOw2uxqWvSvU6zeEwSdmP6RzZ3eXw=",
+    "zh:017a55cdbd444ccf8fe45a3c7cdbc08ddf4f0f13550fcd457c31df9b2cfdb767",
+    "zh:100e9bd10868547193134082427abebad9db6359f6139a882192232e8e6911e3",
+    "zh:34467f6504e8527bd3e18e372d5386a43f2bffd88abf54bb72d51f04ab3e4e23",
+    "zh:3a278f5f71e39d29c7db999e2a34e8135b79cee4f36510b0f2c2dfec47997cf1",
+    "zh:3be1fbe17382c91561b1985d372606d802513d94bae6368e1bafd8dd49494737",
+    "zh:3f12bd7a629d547c706c380d9499ff39eab7b8824a14662aa446f230304bdd3a",
+    "zh:404acaa9ad7f95e83baf2332be54c065c21053bf304e80ac41ae49719462b184",
+    "zh:5ac5f6159d1e0c989e739cf16aa8dede6cee3562a6262bf9f2c6b53f4da866fe",
+    "zh:7a440ee173e69fa153ea4baea47adfca34d7171ffc83e7a1c0ec319d28998cbc",
+    "zh:87e2200bf66443671e249108d1cfa4aa13a31b9fdf445cec88364db8ea6be623",
+    "zh:b1b20b2b751df7765225cee5b01290b06e245e50faa8053495c2ef5ebe316998",
+    "zh:c8ddda9cf7dff40d762ea4dc22941c993ae8e9b2388c8d421f43254a56c98482",
+    "zh:d6ce83f0077a9f6262ffa1f7d777e2b72feac7ea7c8735aa39a5f86b4f3f7084",
+    "zh:d74126b9189ab4ca137ca634eaa25c571491bdd2456ccd0f3276a6d49163e412",
+    "zh:db5d415346e03eac0c5e025f9c10afdebfff35487e8a8383b3c4cd867c422fe2",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/external" {
-  version = "2.3.1"
+  version = "2.3.4"
   hashes = [
-    "h1:bROCw6g5D/3fFnWeJ01L4IrdnJl1ILU8DGDgXCtYzaY=",
-    "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54",
-    "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee",
-    "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd",
-    "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2",
-    "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9",
+    "h1:XWkRZOLKMjci9/JAtE8X8fWOt7A4u+9mgXSUjc4Wuyo=",
+    "zh:037fd82cd86227359bc010672cd174235e2d337601d4686f526d0f53c87447cb",
+    "zh:0ea1db63d6173d01f2fa8eb8989f0809a55135a0d8d424b08ba5dabad73095fa",
+    "zh:17a4d0a306566f2e45778fbac48744b6fd9c958aaa359e79f144c6358cb93af0",
+    "zh:298e5408ab17fd2e90d2cd6d406c6d02344fe610de5b7dae943a58b958e76691",
+    "zh:38ecfd29ee0785fd93164812dcbe0664ebbe5417473f3b2658087ca5a0286ecb",
+    "zh:59f6a6f31acf66f4ea3667a555a70eba5d406c6e6d93c2c641b81d63261eeace",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df",
-    "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e",
-    "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326",
-    "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05",
-    "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8",
-    "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417",
+    "zh:ad0279dfd09d713db0c18469f585e58d04748ca72d9ada83883492e0dd13bd58",
+    "zh:c69f66fd21f5e2c8ecf7ca68d9091c40f19ad913aef21e3ce23836e91b8cbb5f",
+    "zh:d4a56f8c48aa86fc8e0c233d56850f5783f322d6336f3bf1916e293246b6b5d4",
+    "zh:f2b394ebd4af33f343835517e80fc876f79361f4688220833bc3c77655dd2202",
+    "zh:f31982f29f12834e5d21e010856eddd19d59cd8f449adf470655bfd19354377e",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/null" {
+  version = "3.2.3"
+  hashes = [
+    "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=",
+    "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2",
+    "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d",
+    "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3",
+    "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f",
+    "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301",
+    "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670",
+    "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed",
+    "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65",
+    "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd",
+    "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/random" {
-  version = "3.5.1"
+  version = "3.6.3"
   hashes = [
-    "h1:VSnd9ZIPyfKHOObuQCaKfnjIHRtR7qTw19Rz8tJxm+k=",
-    "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64",
-    "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d",
-    "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831",
-    "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3",
-    "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f",
+    "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b",
-    "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2",
-    "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865",
-    "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03",
-    "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602",
-    "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
   ]
 }
 
@@ -83,3 +102,28 @@ provider "registry.terraform.io/kreuzwerker/docker" {
     "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
   ]
 }
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version = "3.52.0"
+  hashes = [
+    "h1:Ysy1sQzitKtM+FRpkhVjNjkcozm2e+niJJip6ID4zP8=",
+    "zh:05f00cab1192243fdeb6fe44e1a81cfec4ddbb5027644343ba8ffa42d338c75c",
+    "zh:10b9fc63af1ed44078deee434492c3c1a6803e946c7c7c40635f37aadfada83f",
+    "zh:14dc4f8772b8abc4c4e771f44fae896c694a0097545f4e493d4a69a6b713e3db",
+    "zh:35bebb6a26036c331f5e9d67f97fad80f9ec7ac6634617e57b1a1b4eb0ab3c2f",
+    "zh:3d82b966e832d556ee28be2b88eae0909c07c18c2714c6e3c901f048467eafa8",
+    "zh:40c167866e89832412665f1125d278221fe33a239bca3a401bea2cf34b9ce66d",
+    "zh:5f8c027d264e9ed49abbab4ff1ef08ae1fdf47fadf3e50bed212ab3a985bd6c5",
+    "zh:67d9f53f4109378c494c1478047be34b6b0c2b22add07ba5c26b9d4db77cce67",
+    "zh:838074a601656e0868b64864d739bb878250a41dc79b67499ae8563439e34b73",
+    "zh:99ba546fdbc428b0a667ffc0a6f19609dd5d859a6c9d4b01e80cdbf5ea054e9d",
+    "zh:ab0da597e428f69fbd2cee8d6be03884893358965974d7d7cb838c4b352b960a",
+    "zh:ab78d74fc5bf05fc9764da864315f572dbc63c45e17bc665a668d1ae82a08d3c",
+    "zh:baffd3a7384622100d5a01d0e520910314f892fa30410e4294a30db76bdee825",
+    "zh:c2400a8536c6fc7983207773eb98e757a0074f9daa0e13e1e661de5788fb134f",
+    "zh:d576df69c43e85a7bba817b7cc38fd1b8c44ddb747be7ab3705315866fd29f47",
+    "zh:d9d8f688ecc32c312bc6bf0619aef2ad1023138e52b0c8b7dd2d06901dade2e9",
+    "zh:f9f24572bd76b2b5d9de780db656228bea12ea1f3d1caea2879b171ce5c385f4",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
diff --git a/terraform/production/init.sh b/terraform/production/init.sh
index a346e0b148..40268c41f2 100755
--- a/terraform/production/init.sh
+++ b/terraform/production/init.sh
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-  
\ No newline at end of file
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/production/providers-managed.tf b/terraform/production/providers-managed.tf
index a6d4ffe122..c9a41eaec1 100644
--- a/terraform/production/providers-managed.tf
+++ b/terraform/production/providers-managed.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
\ No newline at end of file
+}
diff --git a/terraform/shared/modules/cg-logshipper/cg-logshipper.tf b/terraform/shared/modules/cg-logshipper/cg-logshipper.tf
index d35309a8c9..c8686d21e3 100644
--- a/terraform/shared/modules/cg-logshipper/cg-logshipper.tf
+++ b/terraform/shared/modules/cg-logshipper/cg-logshipper.tf
@@ -1,115 +1,114 @@
-data "cloudfoundry_domain" "public" {
-  name = "app.cloud.gov"
-}
-
-data "cloudfoundry_space" "apps" {
-  org_name = var.cf_org_name
-  name     = var.cf_space_name
-}
-
-module "s3-logshipper-storage" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
-
-  cf_org_name      = var.cf_org_name
-  cf_space_name    = var.cf_space_name
-  name             = "log-storage"
-  recursive_delete = false
-  s3_plan_name     = "basic"
-  tags             = ["logshipper-s3"]
-}
-
-resource "cloudfoundry_service_key" "logshipper-s3-service-key" {
-  name             = "fac-to-gsa"
-  service_instance = module.s3-logshipper-storage.bucket_id
-}
-
-resource "cloudfoundry_route" "logshipper" {
-  space    = data.cloudfoundry_space.apps.id
-  domain   = data.cloudfoundry_domain.public.id
-  hostname = "fac-${var.cf_space_name}-${var.name}"
-  # Yields something like: fac-spacename-name
-}
-
-resource "cloudfoundry_user_provided_service" "logshipper_creds" {
-  name  = "cg-logshipper-creds"
-  space = data.cloudfoundry_space.apps.id
-  credentials = {
-    "HTTP_USER" = local.username
-    "HTTP_PASS" = local.password
-  }
-  tags = ["logshipper-creds"]
-}
-
-resource "cloudfoundry_user_provided_service" "logdrain_service" {
-  name             = "fac-logdrain"
-  space            = data.cloudfoundry_space.apps.id
-  syslog_drain_url = local.syslog_drain
-}
-
-resource "random_uuid" "username" {}
-resource "random_password" "password" {
-  length  = 16
-  special = false
-}
-
-locals {
-  username     = random_uuid.username.result
-  password     = random_password.password.result
-  syslog_drain = "https://${local.username}:${local.password}@${cloudfoundry_route.logshipper.hostname}.app.cloud.gov/?drain-type=all"
-  domain       = cloudfoundry_route.logshipper.endpoint
-  app_id       = cloudfoundry_app.cg_logshipper_app.id
-  logdrain_id  = cloudfoundry_user_provided_service.logdrain_service.id
-  sidecar_json = jsonencode(
-    {
-      "name" : "fluentbit",
-      "command" : "/home/vcap/deps/0/apt/opt/fluent-bit/bin/fluent-bit -Y -c fluentbit.conf",
-      "process_types" : ["web"],
-    }
-  )
-}
-
-data "external" "logshipperzip" {
-  program     = ["/bin/sh", "prepare-logshipper.sh"]
-  working_dir = path.module
-  query = {
-    gitref = var.gitref
-  }
-}
-
-resource "cloudfoundry_app" "cg_logshipper_app" {
-  name       = var.name
-  space      = data.cloudfoundry_space.apps.id
-  buildpacks = ["https://github.com/cloudfoundry/apt-buildpack", "nginx_buildpack"]
-  path       = "${path.module}/${data.external.logshipperzip.result.path}"
-  # source_code_hash  = filesha256("${path.module}/${data.external.logshipperzip.result.path}")
-  timeout           = 180
-  disk_quota        = var.disk_quota
-  memory            = var.logshipper_memory
-  instances         = var.logshipper_instances
-  strategy          = "rolling"
-  health_check_type = "process"
-
-  provisioner "local-exec" {
-    command = "cf curl /v3/apps/${self.id}/sidecars  -d '${local.sidecar_json}'"
-  }
-
-  service_binding {
-    service_instance = var.new_relic_id
-  }
-
-  service_binding {
-    service_instance = cloudfoundry_user_provided_service.logshipper_creds.id
-  }
-
-  service_binding {
-    service_instance = module.s3-logshipper-storage.bucket_id
-  }
-
-  routes {
-    route = cloudfoundry_route.logshipper.id
-  }
-
-  environment = {
-    PROXYROUTE = var.https_proxy
-  }
-}
+data "cloudfoundry_domain" "public" {
+  name = "app.cloud.gov"
+}
+
+data "cloudfoundry_space" "apps" {
+  org_name = var.cf_org_name
+  name     = var.cf_space_name
+}
+
+module "s3-logshipper-storage" {
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
+
+  cf_org_name   = var.cf_org_name
+  cf_space_name = var.cf_space_name
+  name          = "log-storage"
+  s3_plan_name  = "basic"
+  tags          = ["logshipper-s3"]
+}
+
+resource "cloudfoundry_service_key" "logshipper-s3-service-key" {
+  name             = "fac-to-gsa"
+  service_instance = module.s3-logshipper-storage.bucket_id
+}
+
+resource "cloudfoundry_route" "logshipper" {
+  space    = data.cloudfoundry_space.apps.id
+  domain   = data.cloudfoundry_domain.public.id
+  hostname = "fac-${var.cf_space_name}-${var.name}"
+  # Yields something like: fac-spacename-name
+}
+
+resource "cloudfoundry_user_provided_service" "logshipper_creds" {
+  name  = "cg-logshipper-creds"
+  space = data.cloudfoundry_space.apps.id
+  credentials = {
+    "HTTP_USER" = local.username
+    "HTTP_PASS" = local.password
+  }
+  tags = ["logshipper-creds"]
+}
+
+resource "cloudfoundry_user_provided_service" "logdrain_service" {
+  name             = "fac-logdrain"
+  space            = data.cloudfoundry_space.apps.id
+  syslog_drain_url = local.syslog_drain
+}
+
+resource "random_uuid" "username" {}
+resource "random_password" "password" {
+  length  = 16
+  special = false
+}
+
+locals {
+  username     = random_uuid.username.result
+  password     = random_password.password.result
+  syslog_drain = "https://${local.username}:${local.password}@${cloudfoundry_route.logshipper.hostname}.app.cloud.gov/?drain-type=all"
+  domain       = cloudfoundry_route.logshipper.endpoint
+  app_id       = cloudfoundry_app.cg_logshipper_app.id
+  logdrain_id  = cloudfoundry_user_provided_service.logdrain_service.id
+  sidecar_json = jsonencode(
+    {
+      "name" : "fluentbit",
+      "command" : "/home/vcap/deps/0/apt/opt/fluent-bit/bin/fluent-bit -Y -c fluentbit.conf",
+      "process_types" : ["web"],
+    }
+  )
+}
+
+data "external" "logshipperzip" {
+  program     = ["/bin/sh", "prepare-logshipper.sh"]
+  working_dir = path.module
+  query = {
+    gitref = var.gitref
+  }
+}
+
+resource "cloudfoundry_app" "cg_logshipper_app" {
+  name       = var.name
+  space      = data.cloudfoundry_space.apps.id
+  buildpacks = ["https://github.com/cloudfoundry/apt-buildpack", "nginx_buildpack"]
+  path       = "${path.module}/${data.external.logshipperzip.result.path}"
+  # source_code_hash  = filesha256("${path.module}/${data.external.logshipperzip.result.path}")
+  timeout           = 180
+  disk_quota        = var.disk_quota
+  memory            = var.logshipper_memory
+  instances         = var.logshipper_instances
+  strategy          = "rolling"
+  health_check_type = "process"
+
+  provisioner "local-exec" {
+    command = "cf curl /v3/apps/${self.id}/sidecars  -d '${local.sidecar_json}'"
+  }
+
+  service_binding {
+    service_instance = var.new_relic_id
+  }
+
+  service_binding {
+    service_instance = cloudfoundry_user_provided_service.logshipper_creds.id
+  }
+
+  service_binding {
+    service_instance = module.s3-logshipper-storage.bucket_id
+  }
+
+  routes {
+    route = cloudfoundry_route.logshipper.id
+  }
+
+  environment = {
+    PROXYROUTE = var.https_proxy
+  }
+}
diff --git a/terraform/shared/modules/env/clamav.tf b/terraform/shared/modules/env/clamav.tf
index f8cc1d22d5..e2c3ce2ca6 100644
--- a/terraform/shared/modules/env/clamav.tf
+++ b/terraform/shared/modules/env/clamav.tf
@@ -8,7 +8,7 @@ data "docker_registry_image" "clamav" {
 }
 
 module "clamav" {
-  source = "github.com/gsa-tts/terraform-cloudgov//clamav?ref=v0.9.0"
+  source = "github.com/gsa-tts/terraform-cloudgov//clamav?ref=v1.1.0"
 
   # This generates eg "fac-av-staging.apps.internal", avoiding collisions with routes for other projects and spaces
   name           = local.clam_name
@@ -28,7 +28,7 @@ module "clamav" {
 }
 
 module "file_scanner_clamav" {
-  source = "github.com/gsa-tts/terraform-cloudgov//clamav?ref=v0.9.0"
+  source = "github.com/gsa-tts/terraform-cloudgov//clamav?ref=v1.1.0"
 
   # This generates eg "fac-av-staging-fs.apps.internal", avoiding collisions with routes for other projects and spaces
   name           = local.fs_clam_name
diff --git a/terraform/shared/modules/env/env.tf b/terraform/shared/modules/env/env.tf
index 8eb8319537..7b0542509a 100644
--- a/terraform/shared/modules/env/env.tf
+++ b/terraform/shared/modules/env/env.tf
@@ -1,47 +1,43 @@
 module "database" {
-  source = "github.com/gsa-tts/terraform-cloudgov//database?ref=v0.9.1"
-
-  cf_org_name      = var.cf_org_name
-  cf_space_name    = var.cf_space_name
-  name             = "fac-db"
-  recursive_delete = var.recursive_delete
-  tags             = ["rds"]
-  rds_plan_name    = var.database_plan
-  json_params      = var.json_params
+  source = "github.com/gsa-tts/terraform-cloudgov//database?ref=v1.1.0"
+
+  cf_org_name   = var.cf_org_name
+  cf_space_name = var.cf_space_name
+  name          = "fac-db"
+  tags          = ["rds"]
+  rds_plan_name = var.database_plan
+  json_params   = var.json_params
 }
 
 module "snapshot-database" {
-  source = "github.com/gsa-tts/terraform-cloudgov//database?ref=v0.9.1"
-
-  cf_org_name      = var.cf_org_name
-  cf_space_name    = var.cf_space_name
-  name             = "fac-snapshot-db"
-  recursive_delete = var.recursive_delete
-  tags             = ["rds"]
-  rds_plan_name    = var.database_plan
-  json_params      = var.json_params
+  source = "github.com/gsa-tts/terraform-cloudgov//database?ref=v1.1.0"
+
+  cf_org_name   = var.cf_org_name
+  cf_space_name = var.cf_space_name
+  name          = "fac-snapshot-db"
+  tags          = ["rds"]
+  rds_plan_name = var.database_plan
+  json_params   = var.json_params
 }
 
 module "s3-public" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
-
-  cf_org_name      = var.cf_org_name
-  cf_space_name    = var.cf_space_name
-  name             = "fac-public-s3"
-  recursive_delete = var.recursive_delete
-  s3_plan_name     = "basic-public"
-  tags             = ["s3"]
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
+
+  cf_org_name   = var.cf_org_name
+  cf_space_name = var.cf_space_name
+  name          = "fac-public-s3"
+  s3_plan_name  = "basic-public"
+  tags          = ["s3"]
 }
 
 module "s3-private" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
-
-  cf_org_name      = var.cf_org_name
-  cf_space_name    = var.cf_space_name
-  name             = "fac-private-s3"
-  recursive_delete = var.recursive_delete
-  s3_plan_name     = "basic"
-  tags             = ["s3"]
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
+
+  cf_org_name   = var.cf_org_name
+  cf_space_name = var.cf_space_name
+  name          = "fac-private-s3"
+  s3_plan_name  = "basic"
+  tags          = ["s3"]
 }
 
 # Stuff used for apps in this space
diff --git a/terraform/shared/modules/env/providers.tf b/terraform/shared/modules/env/providers.tf
index 48590de894..c60d0b3311 100644
--- a/terraform/shared/modules/env/providers.tf
+++ b/terraform/shared/modules/env/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
 
     docker = {
diff --git a/terraform/shared/modules/env/variables.tf b/terraform/shared/modules/env/variables.tf
index bfad47f724..74153f3e18 100644
--- a/terraform/shared/modules/env/variables.tf
+++ b/terraform/shared/modules/env/variables.tf
@@ -38,12 +38,6 @@ variable "database_plan" {
   default = "medium-gp-psql-redundant"
 }
 
-variable "recursive_delete" {
-  type        = bool
-  description = "when true, deletes service bindings attached to the resource (not recommended for production)"
-  default     = false
-}
-
 variable "postgrest_instances" {
   type        = number
   description = "the number of instances of the postgrest application to run (default: 2)"
diff --git a/terraform/shared/modules/scanner/scanner.tf b/terraform/shared/modules/scanner/scanner.tf
index 4a2fbdd26d..1c89e71881 100644
--- a/terraform/shared/modules/scanner/scanner.tf
+++ b/terraform/shared/modules/scanner/scanner.tf
@@ -31,14 +31,13 @@ resource "cloudfoundry_user_provided_service" "clam" {
 }
 
 module "quarantine" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
 
-  cf_org_name      = var.cf_org_name
-  cf_space_name    = var.cf_space_name
-  name             = "fac-file-scanner-quarantine"
-  recursive_delete = var.recursive_delete
-  s3_plan_name     = "basic"
-  tags             = ["s3"]
+  cf_org_name   = var.cf_org_name
+  cf_space_name = var.cf_space_name
+  name          = "fac-file-scanner-quarantine"
+  s3_plan_name  = "basic"
+  tags          = ["s3"]
 }
 
 locals {
diff --git a/terraform/shared/modules/scanner/variables.tf b/terraform/shared/modules/scanner/variables.tf
index 02f7e805e9..f7eab4e105 100644
--- a/terraform/shared/modules/scanner/variables.tf
+++ b/terraform/shared/modules/scanner/variables.tf
@@ -53,9 +53,3 @@ variable "logdrain_id" {
   type        = string
   description = "the full string of the logdrain id"
 }
-
-variable "recursive_delete" {
-  type        = bool
-  description = "when true, deletes service bindings attached to the resource (not recommended for production)"
-  default     = false
-}
diff --git a/terraform/staging/.terraform.lock.hcl b/terraform/staging/.terraform.lock.hcl
index 7cafe530c3..7815f9d812 100644
--- a/terraform/staging/.terraform.lock.hcl
+++ b/terraform/staging/.terraform.lock.hcl
@@ -2,63 +2,82 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudfoundry-community/cloudfoundry" {
-  version     = "0.51.3"
-  constraints = ">= 0.15.0, ~> 0.51.3"
+  version     = "0.53.1"
+  constraints = ">= 0.15.0, ~> 0.53.1"
   hashes = [
-    "h1:uM0ayyirpxhfyZ9SYxpr7MkS1IUvEbnbsKVajnivoXM=",
-    "zh:011f93f31daefd75e4664ce80462f13f0ee1f93c073b3217730e7a136ca9d544",
-    "zh:0d9078e43a1dcefd62f593e248d7b44478dd75cd70aabdfce92a52abe065f297",
-    "zh:29cc360081f68442ec2f4b1d90f24b9cc3c1017c86e18de62eb8043dbbf7fe8c",
-    "zh:48ea027fd3ecefac3302a58dd61389b086c123d621f094a441aef0c036f9d9f3",
-    "zh:59cbaec857468fe10e91e9f67358bb0c18e91d9dc1bf4386ace42c2a95925889",
-    "zh:8537822684fc2b531ed1c404da25fee2af71f9cfc326bb26b35828d6a7087ed3",
-    "zh:b0d88d3fcd86c5c493de4001e9f1c961e1650a364831380c2aa9ab17551094b7",
-    "zh:cbde14e2c1f84285b0ae28dfb0c495ec6ba503d3abd95774f92492dd26276e14",
-    "zh:cc29ecc864a5f2c1f4d3c6425d595c163ccd202203a40dc78a22f7b8f945efc8",
-    "zh:d3ab24d7b5081b3858053b88222c7652d7432de15a3e037eef0f5d96881f7ef8",
-    "zh:dc125bab081ae478c0afedbeb805238f97fea83e999aa94c2e400e646b845df2",
-    "zh:e12d7ed99ac17b2724f2129db75540c55bbe9e10d067dac8d71216598ce492d1",
-    "zh:fb4f969728f285b5dc460fc8693cfb3f0d4139bda2d389e5de2a0ad91f2009a1",
-    "zh:fca9941b778e7f6ca57d44d698f528438283ab15c1789d8b48be722fe7c03b4b",
-    "zh:fea692d2ed3d4e9da5aebdc54d1c19afe97e07d597b7d5d768224976bc329cc2",
+    "h1:U6Cx0ZA1N8PlKPYOw2uxqWvSvU6zeEwSdmP6RzZ3eXw=",
+    "zh:017a55cdbd444ccf8fe45a3c7cdbc08ddf4f0f13550fcd457c31df9b2cfdb767",
+    "zh:100e9bd10868547193134082427abebad9db6359f6139a882192232e8e6911e3",
+    "zh:34467f6504e8527bd3e18e372d5386a43f2bffd88abf54bb72d51f04ab3e4e23",
+    "zh:3a278f5f71e39d29c7db999e2a34e8135b79cee4f36510b0f2c2dfec47997cf1",
+    "zh:3be1fbe17382c91561b1985d372606d802513d94bae6368e1bafd8dd49494737",
+    "zh:3f12bd7a629d547c706c380d9499ff39eab7b8824a14662aa446f230304bdd3a",
+    "zh:404acaa9ad7f95e83baf2332be54c065c21053bf304e80ac41ae49719462b184",
+    "zh:5ac5f6159d1e0c989e739cf16aa8dede6cee3562a6262bf9f2c6b53f4da866fe",
+    "zh:7a440ee173e69fa153ea4baea47adfca34d7171ffc83e7a1c0ec319d28998cbc",
+    "zh:87e2200bf66443671e249108d1cfa4aa13a31b9fdf445cec88364db8ea6be623",
+    "zh:b1b20b2b751df7765225cee5b01290b06e245e50faa8053495c2ef5ebe316998",
+    "zh:c8ddda9cf7dff40d762ea4dc22941c993ae8e9b2388c8d421f43254a56c98482",
+    "zh:d6ce83f0077a9f6262ffa1f7d777e2b72feac7ea7c8735aa39a5f86b4f3f7084",
+    "zh:d74126b9189ab4ca137ca634eaa25c571491bdd2456ccd0f3276a6d49163e412",
+    "zh:db5d415346e03eac0c5e025f9c10afdebfff35487e8a8383b3c4cd867c422fe2",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/external" {
-  version = "2.3.1"
+  version = "2.3.4"
   hashes = [
-    "h1:bROCw6g5D/3fFnWeJ01L4IrdnJl1ILU8DGDgXCtYzaY=",
-    "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54",
-    "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee",
-    "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd",
-    "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2",
-    "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9",
+    "h1:XWkRZOLKMjci9/JAtE8X8fWOt7A4u+9mgXSUjc4Wuyo=",
+    "zh:037fd82cd86227359bc010672cd174235e2d337601d4686f526d0f53c87447cb",
+    "zh:0ea1db63d6173d01f2fa8eb8989f0809a55135a0d8d424b08ba5dabad73095fa",
+    "zh:17a4d0a306566f2e45778fbac48744b6fd9c958aaa359e79f144c6358cb93af0",
+    "zh:298e5408ab17fd2e90d2cd6d406c6d02344fe610de5b7dae943a58b958e76691",
+    "zh:38ecfd29ee0785fd93164812dcbe0664ebbe5417473f3b2658087ca5a0286ecb",
+    "zh:59f6a6f31acf66f4ea3667a555a70eba5d406c6e6d93c2c641b81d63261eeace",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df",
-    "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e",
-    "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326",
-    "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05",
-    "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8",
-    "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417",
+    "zh:ad0279dfd09d713db0c18469f585e58d04748ca72d9ada83883492e0dd13bd58",
+    "zh:c69f66fd21f5e2c8ecf7ca68d9091c40f19ad913aef21e3ce23836e91b8cbb5f",
+    "zh:d4a56f8c48aa86fc8e0c233d56850f5783f322d6336f3bf1916e293246b6b5d4",
+    "zh:f2b394ebd4af33f343835517e80fc876f79361f4688220833bc3c77655dd2202",
+    "zh:f31982f29f12834e5d21e010856eddd19d59cd8f449adf470655bfd19354377e",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/null" {
+  version = "3.2.3"
+  hashes = [
+    "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=",
+    "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2",
+    "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d",
+    "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3",
+    "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f",
+    "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301",
+    "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670",
+    "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed",
+    "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65",
+    "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd",
+    "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/random" {
-  version = "3.5.1"
+  version = "3.6.3"
   hashes = [
-    "h1:VSnd9ZIPyfKHOObuQCaKfnjIHRtR7qTw19Rz8tJxm+k=",
-    "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64",
-    "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d",
-    "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831",
-    "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3",
-    "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f",
+    "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b",
-    "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2",
-    "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865",
-    "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03",
-    "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602",
-    "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
   ]
 }
 
@@ -83,3 +102,28 @@ provider "registry.terraform.io/kreuzwerker/docker" {
     "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
   ]
 }
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version = "3.52.0"
+  hashes = [
+    "h1:Ysy1sQzitKtM+FRpkhVjNjkcozm2e+niJJip6ID4zP8=",
+    "zh:05f00cab1192243fdeb6fe44e1a81cfec4ddbb5027644343ba8ffa42d338c75c",
+    "zh:10b9fc63af1ed44078deee434492c3c1a6803e946c7c7c40635f37aadfada83f",
+    "zh:14dc4f8772b8abc4c4e771f44fae896c694a0097545f4e493d4a69a6b713e3db",
+    "zh:35bebb6a26036c331f5e9d67f97fad80f9ec7ac6634617e57b1a1b4eb0ab3c2f",
+    "zh:3d82b966e832d556ee28be2b88eae0909c07c18c2714c6e3c901f048467eafa8",
+    "zh:40c167866e89832412665f1125d278221fe33a239bca3a401bea2cf34b9ce66d",
+    "zh:5f8c027d264e9ed49abbab4ff1ef08ae1fdf47fadf3e50bed212ab3a985bd6c5",
+    "zh:67d9f53f4109378c494c1478047be34b6b0c2b22add07ba5c26b9d4db77cce67",
+    "zh:838074a601656e0868b64864d739bb878250a41dc79b67499ae8563439e34b73",
+    "zh:99ba546fdbc428b0a667ffc0a6f19609dd5d859a6c9d4b01e80cdbf5ea054e9d",
+    "zh:ab0da597e428f69fbd2cee8d6be03884893358965974d7d7cb838c4b352b960a",
+    "zh:ab78d74fc5bf05fc9764da864315f572dbc63c45e17bc665a668d1ae82a08d3c",
+    "zh:baffd3a7384622100d5a01d0e520910314f892fa30410e4294a30db76bdee825",
+    "zh:c2400a8536c6fc7983207773eb98e757a0074f9daa0e13e1e661de5788fb134f",
+    "zh:d576df69c43e85a7bba817b7cc38fd1b8c44ddb747be7ab3705315866fd29f47",
+    "zh:d9d8f688ecc32c312bc6bf0619aef2ad1023138e52b0c8b7dd2d06901dade2e9",
+    "zh:f9f24572bd76b2b5d9de780db656228bea12ea1f3d1caea2879b171ce5c385f4",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
diff --git a/terraform/staging/init.sh b/terraform/staging/init.sh
index a346e0b148..40268c41f2 100755
--- a/terraform/staging/init.sh
+++ b/terraform/staging/init.sh
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-  
\ No newline at end of file
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/staging/providers-managed.tf b/terraform/staging/providers-managed.tf
index a6d4ffe122..c9a41eaec1 100644
--- a/terraform/staging/providers-managed.tf
+++ b/terraform/staging/providers-managed.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
\ No newline at end of file
+}
diff --git a/terraform/staging/staging.tf b/terraform/staging/staging.tf
index 3b70097824..14e938b178 100644
--- a/terraform/staging/staging.tf
+++ b/terraform/staging/staging.tf
@@ -15,7 +15,6 @@ module "staging" {
   clamav_instances      = 1
   clamav_memory         = 2048
   clamav_fs_instances   = 1
-  recursive_delete      = true
   json_params = jsonencode(
     {
       "storage" : 50,
@@ -24,7 +23,7 @@ module "staging" {
 }
 
 module "staging-backups-bucket" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
 
   cf_org_name   = var.cf_org_name
   cf_space_name = "staging"