diff --git a/e2e/infra/terraform/fingerprint.tf b/e2e/infra/terraform/fingerprint.tf
index b71ce3e5..b8f9a111 100644
--- a/e2e/infra/terraform/fingerprint.tf
+++ b/e2e/infra/terraform/fingerprint.tf
@@ -1,5 +1,6 @@
 module "fingerprint_cloudfront_integration" {
   source = "fingerprintjs/fingerprint-cloudfront-proxy-integration/aws"
+  version = "2.0.0-rc.1"
 
   fpjs_agent_download_path = var.fpjs_agent_download_path
   fpjs_get_result_path     = var.fpjs_get_result_path
@@ -8,11 +9,11 @@ module "fingerprint_cloudfront_integration" {
   local_lambda_path        = "../../../lambda_latest.zip"
 }
 
-// TODO After release, replace with source from above
 module "fingerprint_cloudfront_integration_v4_only" {
-  source = "git::https://github.com/fingerprintjs/terraform-aws-fingerprint-cloudfront-proxy-integration.git?ref=feature/add-v4-support"
+  source = "fingerprintjs/fingerprint-cloudfront-proxy-integration/aws"
+  version = "2.0.0-rc.1"
 
   fpjs_shared_secret       = var.fpjs_shared_secret
   fetch_lambda_from_s3     = false
   local_lambda_path        = "../../../lambda_latest.zip"
-}
\ No newline at end of file
+}
diff --git a/e2e/infra/terraform/versions.tf b/e2e/infra/terraform/versions.tf
index 0bb43887..082cba89 100644
--- a/e2e/infra/terraform/versions.tf
+++ b/e2e/infra/terraform/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "5.95.0"
+      version = "6.38.0"
     }
     random = {
       source  = "hashicorp/random"