diff --git a/.aws/src/main.ts b/.aws/src/main.ts
index 1b1f4dc48..872ec7f71 100644
--- a/.aws/src/main.ts
+++ b/.aws/src/main.ts
@@ -13,7 +13,10 @@ import {config} from './config';
 import {DynamoDB} from "./dynamodb";
 import {PocketALBApplication, PocketECSCodePipeline} from "@pocket-tools/terraform-modules";
 import {PocketPagerDuty} from "@pocket-tools/terraform-modules";
-import {PagerdutyProvider} from "@cdktf/provider-pagerduty";
+import {
+  DataPagerdutyEscalationPolicy,
+  PagerdutyProvider,
+} from "@cdktf/provider-pagerduty";
 import {SqsLambda} from "./sqsLambda";
 import {Elasticache} from "./elasticache";
 
@@ -103,26 +106,19 @@ class RecommendationAPI extends TerraformStack {
         }
 
 
-        const incidentManagement = new DataTerraformRemoteState(
+        const mozillaEscalation = new DataPagerdutyEscalationPolicy(
             this,
-            'incident_management',
+            'mozilla_sre_escalation_policy',
             {
-                organization: 'Pocket',
-                workspaces: {
-                    name: 'incident-management'
-                }
+              name: 'IT SRE: Escalation Policy'
             }
         );
 
         return new PocketPagerDuty(this, 'pagerduty', {
             prefix: config.prefix,
             service: {
-                criticalEscalationPolicyId: incidentManagement.get(
-                    'policy_data_eng_critical_id'
-                ),
-                nonCriticalEscalationPolicyId: incidentManagement.get(
-                    'policy_data_eng_non_critical_id'
-                )
+                criticalEscalationPolicyId: mozillaEscalation.id,
+                nonCriticalEscalationPolicyId: mozillaEscalation.id,
             }
         });
     }
diff --git a/buildspec.yml b/buildspec.yml
index 86bb73c6a..1c3e07255 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -22,7 +22,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 hashicorp/terraform:light docker image