diff --git a/website/www/site/content/en/blog/review-input-streaming-connectors.md b/website/www/site/content/en/blog/review-input-streaming-connectors.md
index 9cafe96747f5..9ab7419bd801 100644
--- a/website/www/site/content/en/blog/review-input-streaming-connectors.md
+++ b/website/www/site/content/en/blog/review-input-streaming-connectors.md
@@ -82,7 +82,7 @@ and <a href="https://spark.apache.org/docs/latest/api/java/org/apache/spark/stre
   <tr>
    <td>S3<br>(Using the <code>s3://</code> URI)
    </td>
-    <td><a href="https://beam.apache.org/releases/javadoc/{{< param release_latest >}}/org/apache/beam/sdk/io/FileIO.html">FileIO</a> + <a href="https://beam.apache.org/releases/javadoc/{{< param release_latest >}}/org/apache/beam/sdk/io/aws/options/S3Options.html">S3Options</a>
+    <td><a href="https://beam.apache.org/releases/javadoc/{{< param release_latest >}}/org/apache/beam/sdk/io/FileIO.html">FileIO</a> + <a href="https://beam.apache.org/releases/javadoc/{{< param release_latest >}}/org/apache/beam/sdk/io/aws2/options/S3Options.html">S3Options</a>
    </td>
   </tr>
   <tr>
diff --git a/website/www/site/content/en/documentation/io/built-in/snowflake.md b/website/www/site/content/en/documentation/io/built-in/snowflake.md
index c685024be966..cc357d75c569 100644
--- a/website/www/site/content/en/documentation/io/built-in/snowflake.md
+++ b/website/www/site/content/en/documentation/io/built-in/snowflake.md
@@ -729,7 +729,7 @@ static SnowflakeIO.CsvMapper<GenericRecord> getCsvMapper() {
 {{< /highlight >}}
 ## Using SnowflakeIO with AWS S3
 To be able to use AWS S3 bucket as `stagingBucketName` is required to:
-1. Create `PipelineOptions` interface which is [extending](https://beam.apache.org/documentation/io/built-in/snowflake/#extending-pipeline-options) `SnowflakePipelineOptions` and [S3Options](https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws/options/S3Options.html)
+1. Create `PipelineOptions` interface which is [extending](https://beam.apache.org/documentation/io/built-in/snowflake/#extending-pipeline-options) `SnowflakePipelineOptions` and [S3Options](https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws2/options/S3Options.html)
 with `AwsAccessKey` and `AwsSecretKey` options. Example:
 
 {{< highlight >}}
@@ -763,7 +763,7 @@ options.setAwsCredentialsProvider(
 Pipeline p = Pipeline.create(options);
 {{< /highlight >}}
 
-**Note**: Remember to set `awsRegion` from [S3Options](https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws/options/S3Options.html).
+**Note**: Remember to set `awsRegion` from [S3Options](https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws2/options/S3Options.html).
 
 ## Using SnowflakeIO in Python SDK
 ### Intro
diff --git a/website/www/site/content/en/documentation/io/connectors.md b/website/www/site/content/en/documentation/io/connectors.md
index 353a3459d3f0..c2a2e78e34dc 100644
--- a/website/www/site/content/en/documentation/io/connectors.md
+++ b/website/www/site/content/en/documentation/io/connectors.md
@@ -221,7 +221,7 @@ This table provides a consolidated, at-a-glance overview of the available built-
     <td class="present">✔</td>
     <td class="present">
       ✔
-      <a href="https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws/s3/S3FileSystemRegistrar.html">native</a>
+      <a href="https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws2/s3/S3FileSystemRegistrar.html">native</a>
     </td>
     <td class="present">
       ✔
@@ -250,7 +250,7 @@ This table provides a consolidated, at-a-glance overview of the available built-
     <td class="present">✔</td>
     <td class="present">
       ✔
-      <a href="https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/kinesis/KinesisIO.html">native</a>
+      <a href="https://beam.apache.org/releases/javadoc/current/org/apache/beam/sdk/io/aws2/kinesis/KinesisIO.html">native</a>
     </td>
     <td class="present">
       ✔