diff --git a/e2e/infra/cloudfront/src/cloudfront-with-headers.ts b/e2e/infra/cloudfront/src/cloudfront-with-headers.ts
index 1d297388..f214536d 100644
--- a/e2e/infra/cloudfront/src/cloudfront-with-headers.ts
+++ b/e2e/infra/cloudfront/src/cloudfront-with-headers.ts
@@ -68,7 +68,7 @@ const cloudfrontDistro = new aws.cloudfront.Distribution(resource('website-with-
       pathPattern: 'fpjs/*',
       viewerProtocolPolicy: 'redirect-to-https',
       cachePolicyId: lambdaCachePolicy.id,
-      originRequestPolicyId: lambdaOriginPolicy.id,
+      originRequestPolicyId: lambdaOriginPolicy,
       allowedMethods: ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT'],
       cachedMethods: ['GET', 'HEAD'],
       targetOriginId: s3OriginId,
diff --git a/e2e/infra/cloudfront/src/cloudfront-with-secrets.ts b/e2e/infra/cloudfront/src/cloudfront-with-secrets.ts
index 678cf9fa..d45caf3a 100644
--- a/e2e/infra/cloudfront/src/cloudfront-with-secrets.ts
+++ b/e2e/infra/cloudfront/src/cloudfront-with-secrets.ts
@@ -63,7 +63,7 @@ const cloudfrontDistro = new aws.cloudfront.Distribution(resource('website-with-
       pathPattern: 'fpjs/*',
       viewerProtocolPolicy: 'redirect-to-https',
       cachePolicyId: lambdaCachePolicy.id,
-      originRequestPolicyId: lambdaOriginPolicy.id,
+      originRequestPolicyId: lambdaOriginPolicy,
       allowedMethods: ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT'],
       cachedMethods: ['GET', 'HEAD'],
       targetOriginId: s3OriginId,
diff --git a/e2e/infra/cloudfront/src/cloudfront-without-variables.ts b/e2e/infra/cloudfront/src/cloudfront-without-variables.ts
index 716ff276..98076c87 100644
--- a/e2e/infra/cloudfront/src/cloudfront-without-variables.ts
+++ b/e2e/infra/cloudfront/src/cloudfront-without-variables.ts
@@ -52,7 +52,7 @@ const cloudfrontDistro = new aws.cloudfront.Distribution(resource('website-witho
       pathPattern: 'fpjs/*',
       viewerProtocolPolicy: 'redirect-to-https',
       cachePolicyId: lambdaCachePolicy.id,
-      originRequestPolicyId: lambdaOriginPolicy.id,
+      originRequestPolicyId: lambdaOriginPolicy,
       allowedMethods: ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT'],
       cachedMethods: ['GET', 'HEAD'],
       targetOriginId: s3OriginId,
diff --git a/e2e/infra/cloudfront/src/lambda.ts b/e2e/infra/cloudfront/src/lambda.ts
index 4de1c1be..db6cfeac 100644
--- a/e2e/infra/cloudfront/src/lambda.ts
+++ b/e2e/infra/cloudfront/src/lambda.ts
@@ -18,14 +18,4 @@ export const lambdaCachePolicy = new aws.cloudfront.CachePolicy(resource('lambda
   },
 })
 
-export const lambdaOriginPolicy = new aws.cloudfront.OriginRequestPolicy(resource('lambda-origin-policy'), {
-  headersConfig: {
-    headerBehavior: 'allViewer',
-  },
-  cookiesConfig: {
-    cookieBehavior: 'all',
-  },
-  queryStringsConfig: {
-    queryStringBehavior: 'all',
-  },
-})
+export const lambdaOriginPolicy = '216adef6-5c7f-47e4-b989-5492eafa07d3' // default AllViewer policy