diff --git a/src/main/java/com/google/firebase/cloud/FirestoreClient.java b/src/main/java/com/google/firebase/cloud/FirestoreClient.java
index e55d5c7e9..682c39f07 100644
--- a/src/main/java/com/google/firebase/cloud/FirestoreClient.java
+++ b/src/main/java/com/google/firebase/cloud/FirestoreClient.java
@@ -19,7 +19,7 @@
 
 /**
  * {@code FirestoreClient} provides access to Google Cloud Firestore. Use this API to obtain a
- * <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+ * <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
  * instance, which provides methods for updating and querying data in Firestore.
  *
  * <p>A Google Cloud project ID is required to access Firestore. FirestoreClient determines the
@@ -60,7 +60,7 @@ private FirestoreClient(FirebaseApp app, String databaseId) {
    * same instance for all invocations. The Firestore instance and all references obtained from it
    * becomes unusable, once the default app is deleted.
    *
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
@@ -74,7 +74,7 @@ public static Firestore getFirestore() {
    * obtained from it becomes unusable, once the specified app is deleted.
    *
    * @param app A non-null {@link FirebaseApp}.
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
@@ -90,7 +90,7 @@ public static Firestore getFirestore(FirebaseApp app) {
    *
    * @param app      A non-null {@link FirebaseApp}.
    * @param database - The name of database.
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
@@ -104,7 +104,7 @@ public static Firestore getFirestore(FirebaseApp app, String database) {
    * references obtained from it becomes unusable, once the default app is deleted.
    *
    * @param database - The name of database.
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
diff --git a/src/main/java/com/google/firebase/cloud/StorageClient.java b/src/main/java/com/google/firebase/cloud/StorageClient.java
index 955abd7e2..172279990 100644
--- a/src/main/java/com/google/firebase/cloud/StorageClient.java
+++ b/src/main/java/com/google/firebase/cloud/StorageClient.java
@@ -71,7 +71,7 @@ public static synchronized StorageClient getInstance(FirebaseApp app) {
    * configured via {@link com.google.firebase.FirebaseOptions} when initializing the app. If
    * no bucket was configured via options, this method throws an exception.
    *
-   * @return a cloud storage <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/storage/Bucket.html">{@code Bucket}</a>
+   * @return a cloud storage <a href="https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/com.google.cloud.storage.Bucket">{@code Bucket}</a>
    *     instance.
    * @throws IllegalArgumentException If no bucket is configured via <code>FirebaseOptions</code>,
    *     or if the bucket does not exist.
@@ -84,7 +84,7 @@ public Bucket bucket() {
    * Returns a cloud storage Bucket instance for the specified bucket name.
    *
    * @param name a non-null, non-empty bucket name.
-   * @return a cloud storage <a href="https://googlecloudplatform.github.io/google-cloud-java/latest/google-cloud-clients/com/google/cloud/storage/Bucket.html">{@code Bucket}</a>
+   * @return a cloud storage <a href="https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/com.google.cloud.storage.Bucket">{@code Bucket}</a>
    *     instance.
    * @throws IllegalArgumentException If the bucket name is null, empty, or if the specified
    *     bucket does not exist.
diff --git a/src/test/java/com/google/firebase/snippets/FirebaseStorageSnippets.java b/src/test/java/com/google/firebase/snippets/FirebaseStorageSnippets.java
index 706cc1b16..0c41dbd6a 100644
--- a/src/test/java/com/google/firebase/snippets/FirebaseStorageSnippets.java
+++ b/src/test/java/com/google/firebase/snippets/FirebaseStorageSnippets.java
@@ -42,7 +42,7 @@ public void initializeAppForStorage() throws IOException {
     Bucket bucket = StorageClient.getInstance().bucket();
 
     // 'bucket' is an object defined in the google-cloud-storage Java library.
-    // See http://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/com/google/cloud/storage/Bucket.html
+    // See https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/com.google.cloud.storage.Bucket
     // for more details.
     // [END init_admin_sdk_for_storage]
     System.out.println("Retrieved bucket: " + bucket.getName());