diff --git a/integration_tests/cdk/app.py b/integration_tests/cdk/app.py
index c7dbcbe..cc8a2fc 100644
--- a/integration_tests/cdk/app.py
+++ b/integration_tests/cdk/app.py
@@ -3,7 +3,8 @@
     Stack,
     aws_ec2,
     aws_rds,
-    App
+    App,
+    RemovalPolicy
 )
 from constructs import Construct
 from eoapi_cdk import (
@@ -86,7 +87,8 @@ def __init__(
                 subnet_type=aws_ec2.SubnetType.PUBLIC,
             ),
             allocated_storage=app_config.db_allocated_storage,
-            instance_type=aws_ec2.InstanceType(app_config.db_instance_type)
+            instance_type=aws_ec2.InstanceType(app_config.db_instance_type),
+            removal_policy=RemovalPolicy.DESTROY
         )
 
         pgstac_db.db.connections.allow_default_port_from_any_ipv4()
@@ -136,11 +138,11 @@ def __init__(
 
 app_config = build_app_config()
 
-vpc_stack_id = f"{app_config.build_service_name('vpc')}".replace('/','')
+vpc_stack_id = f"{app_config.project_id}-vpc"
 
 vpc_stack = VpcStack(scope=app, app_config=app_config, id=vpc_stack_id)
 
-pgstac_infra_stack_id = f"{app_config.build_service_name('pgstac')}".replace('/','')
+pgstac_infra_stack_id = f"{app_config.project_id}-pgstac"
 
 pgstac_infra_stack = pgStacInfraStack(
     scope=app,