diff --git a/.aws/src/main.ts b/.aws/src/main.ts
index f5f180cc..5f98a584 100644
--- a/.aws/src/main.ts
+++ b/.aws/src/main.ts
@@ -149,10 +149,10 @@ class PocketEventBus extends TerraformStack {
       prefix: config.prefix,
       service: {
         criticalEscalationPolicyId: incidentManagement
-          .get('policy_backend_critical_id')
+          .get('policy_default_critical_id')
           .toString(),
         nonCriticalEscalationPolicyId: incidentManagement
-          .get('policy_backend_non_critical_id')
+          .get('policy_default_non_critical_id')
           .toString(),
       },
     });
diff --git a/buildspec.yml b/buildspec.yml
index b7b913e5..83bfb354 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -24,7 +24,7 @@ env:
   secrets-manager:
     #Pull in the default terraform cloud token
     TERRAFORM_TOKEN: 'CodeBuild/Default:terraform_token'
-    PAGERDUTY_TOKEN: 'CodeBuild/Default:pagerduty_token'
+    PAGERDUTY_TOKEN: 'CodeBuild/Default:mozilla_pagerduty_token'
     GITHUB_ACCESS_TOKEN: 'CodeBuild/Default:github_access_token'
 
 #All phases are ran within the pocket/pocket-build:prod docker image