diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/asset/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/asset/_index.md
deleted file mode 100644
index fea9208015fc..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/asset/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/asset.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/automation/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/automation/_index.md
deleted file mode 100644
index 5b4278924d75..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/automation/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/automation.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/dynamic/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/dynamic/_index.md
deleted file mode 100644
index c338690df67e..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/dynamic/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/dynamic.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/iterable/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/iterable/_index.md
deleted file mode 100644
index b13388f635b9..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/iterable/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/iterable.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/log/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/log/_index.md
deleted file mode 100644
index 62cae24f0930..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/log/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/log.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/provider/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/provider/_index.md
deleted file mode 100644
index a75e5dcd818a..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/provider/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/provider.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/runtime/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/runtime/_index.md
deleted file mode 100644
index 66e83c22c92e..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/runtime/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/runtime.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/pulumi/runtime/closure/_index.md b/content/docs/reference/pkg/nodejs/pulumi/pulumi/runtime/closure/_index.md
deleted file mode 100644
index ee49d3cd96f7..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/pulumi/runtime/closure/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/pulumi/modules/runtime/closure.html
----
diff --git a/content/docs/reference/pkg/nodejs/pulumi/terraform/state/_index.md b/content/docs/reference/pkg/nodejs/pulumi/terraform/state/_index.md
deleted file mode 100644
index d8eb7c804b1f..000000000000
--- a/content/docs/reference/pkg/nodejs/pulumi/terraform/state/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-redirect_to: /docs/reference/pkg/nodejs/pulumi/terraform/modules/state.html
----
diff --git a/scripts/ci-pull-request.sh b/scripts/ci-pull-request.sh
index eec8d6171e1d..174207bb088a 100755
--- a/scripts/ci-pull-request.sh
+++ b/scripts/ci-pull-request.sh
@@ -17,3 +17,4 @@ source ./scripts/ci-login.sh
 ./scripts/sync-and-test-bucket.sh preview
 ./scripts/generate-search-index.sh
 ./scripts/run-pulumi.sh preview
+./scripts/make-s3-redirects.sh
diff --git a/scripts/redirects/nodejs-sdk-redirects.txt b/scripts/redirects/nodejs-sdk-redirects.txt
new file mode 100644
index 000000000000..65bbf5d38d9f
--- /dev/null
+++ b/scripts/redirects/nodejs-sdk-redirects.txt
@@ -0,0 +1,43 @@
+docs/reference/pkg/nodejs/pulumi/awsx/apigateway/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.apigateway.html
+docs/reference/pkg/nodejs/pulumi/awsx/autoscaling/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.autoscaling.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/acmpca/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.acmpca.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/apigateway/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.apigateway.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/autoscaling/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.autoscaling.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/billing/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.billing.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/cloudfront/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.cloudfront.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/cloudtrail/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.cloudtrail.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/cloudwatch/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.cloudwatch.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/codebuild/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.codebuild.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/cognito/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.cognito.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/dynamodb/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.dynamodb.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/ebs/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.ebs.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/ec2/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.ec2.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/ecr/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.ecr.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/ecs/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.ecs.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/efs/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.efs.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/lambda/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.lambda.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/lb/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.lb.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/rds/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.rds.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/s3/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.s3.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/sns/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.sns.html
+docs/reference/pkg/nodejs/pulumi/awsx/classic/sqs/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/classic.sqs.html
+docs/reference/pkg/nodejs/pulumi/awsx/cloudtrail/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/cloudtrail.html
+docs/reference/pkg/nodejs/pulumi/awsx/ec2/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/ec2.html
+docs/reference/pkg/nodejs/pulumi/awsx/ecr/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/ec2.html
+docs/reference/pkg/nodejs/pulumi/awsx/ecs/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/ecs.html
+docs/reference/pkg/nodejs/pulumi/awsx/lb/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/lb.html
+docs/reference/pkg/nodejs/pulumi/awsx/types/enums/ec2/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/types.enums.ec2.html
+docs/reference/pkg/nodejs/pulumi/awsx/types/enums/ecr/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/types.enums.ecr.html
+docs/reference/pkg/nodejs/pulumi/awsx/types/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/types.html
+docs/reference/pkg/nodejs/pulumi/awsx/types/input/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/types.input.html
+docs/reference/pkg/nodejs/pulumi/awsx/types/output/index.html|/docs/reference/pkg/nodejs/pulumi/awsx/modules/types.output.html
+docs/reference/pkg/nodejs/pulumi/terraform/state/index.html|/docs/reference/pkg/nodejs/pulumi/terraform/modules/state.html
+docs/reference/pkg/nodejs/pulumi/pulumi/asset/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/asset.html
+docs/reference/pkg/nodejs/pulumi/pulumi/automation/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/automation.html
+docs/reference/pkg/nodejs/pulumi/pulumi/dynamic/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/dynamic.html
+docs/reference/pkg/nodejs/pulumi/pulumi/iterable/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/iterable.html
+docs/reference/pkg/nodejs/pulumi/pulumi/log/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/log.html
+docs/reference/pkg/nodejs/pulumi/pulumi/provider/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/provider.html
+docs/reference/pkg/nodejs/pulumi/pulumi/runtime/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/runtime.html
+docs/reference/pkg/nodejs/pulumi/pulumi/runtime/closure/index.html|/docs/reference/pkg/nodejs/pulumi/pulumi/modules/runtime.html