diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
index 810e65ae7..1bb28e54f 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java
@@ -214,13 +214,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "1/projects/{project_id}/indexes\032v\312A\030data"
           + "store.googleapis.com\322AXhttps://www.googl"
           + "eapis.com/auth/cloud-platform,https://ww"
-          + "w.googleapis.com/auth/datastoreB\340\001\n\035com."
+          + "w.googleapis.com/auth/datastoreB\333\001\n\035com."
           + "google.datastore.admin.v1B\023DatastoreAdmi"
-          + "nProtoP\001Z>google.golang.org/genproto/goo"
-          + "gleapis/datastore/admin/v1;admin\252\002\037Googl"
-          + "e.Cloud.Datastore.Admin.V1\312\002\037Google\\Clou"
-          + "d\\Datastore\\Admin\\V1\352\002#Google::Cloud::Da"
-          + "tastore::Admin::V1b\006proto3"
+          + "nProtoP\001Z9cloud.google.com/go/datastore/"
+          + "admin/apiv1/adminpb;adminpb\252\002\037Google.Clo"
+          + "ud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Dat"
+          + "astore\\Admin\\V1\352\002#Google::Cloud::Datasto"
+          + "re::Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
index d30a12ec7..ff612c3e2 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java
@@ -61,13 +61,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "S\020\002\"E\n\tDirection\022\031\n\025DIRECTION_UNSPECIFIE"
           + "D\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"P\n\005St"
           + "ate\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001"
-          + "\022\t\n\005READY\020\002\022\014\n\010DELETING\020\003\022\t\n\005ERROR\020\004B\327\001\n"
+          + "\022\t\n\005READY\020\002\022\014\n\010DELETING\020\003\022\t\n\005ERROR\020\004B\322\001\n"
           + "\035com.google.datastore.admin.v1B\nIndexPro"
-          + "toP\001Z>google.golang.org/genproto/googlea"
-          + "pis/datastore/admin/v1;admin\252\002\037Google.Cl"
-          + "oud.Datastore.Admin.V1\312\002\037Google\\Cloud\\Da"
-          + "tastore\\Admin\\V1\352\002#Google::Cloud::Datast"
-          + "ore::Admin::V1b\006proto3"
+          + "toP\001Z9cloud.google.com/go/datastore/admi"
+          + "n/apiv1/adminpb;adminpb\252\002\037Google.Cloud.D"
+          + "atastore.Admin.V1\312\002\037Google\\Cloud\\Datasto"
+          + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::"
+          + "Admin::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
index 97561eebd..6d8f2dca9 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
+++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java
@@ -80,13 +80,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "_WRITES_SYNCHRONOUSLY\020\007\022\023\n\017COPY_AND_VERI"
           + "FY\020\002\022(\n$REDIRECT_EVENTUALLY_CONSISTENT_R"
           + "EADS\020\003\022&\n\"REDIRECT_STRONGLY_CONSISTENT_R"
-          + "EADS\020\004\022\023\n\017REDIRECT_WRITES\020\005B\333\001\n\035com.goog"
+          + "EADS\020\004\022\023\n\017REDIRECT_WRITES\020\005B\326\001\n\035com.goog"
           + "le.datastore.admin.v1B\016MigrationProtoP\001Z"
-          + ">google.golang.org/genproto/googleapis/d"
-          + "atastore/admin/v1;admin\252\002\037Google.Cloud.D"
-          + "atastore.Admin.V1\312\002\037Google\\Cloud\\Datasto"
-          + "re\\Admin\\V1\352\002#Google::Cloud::Datastore::"
-          + "Admin::V1b\006proto3"
+          + "9cloud.google.com/go/datastore/admin/api"
+          + "v1/adminpb;adminpb\252\002\037Google.Cloud.Datast"
+          + "ore.Admin.V1\312\002\037Google\\Cloud\\Datastore\\Ad"
+          + "min\\V1\352\002#Google::Cloud::Datastore::Admin"
+          + "::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
index 0d624956e..744d97df7 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/datastore_admin.proto
@@ -25,7 +25,7 @@ import "google/longrunning/operations.proto";
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option go_package = "cloud.google.com/go/datastore/admin/apiv1/adminpb;adminpb";
 option java_multiple_files = true;
 option java_outer_classname = "DatastoreAdminProto";
 option java_package = "com.google.datastore.admin.v1";
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
index 0162af523..4eeffc7e4 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/index.proto
@@ -19,7 +19,7 @@ package google.datastore.admin.v1;
 import "google/api/field_behavior.proto";
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option go_package = "cloud.google.com/go/datastore/admin/apiv1/adminpb;adminpb";
 option java_multiple_files = true;
 option java_outer_classname = "IndexProto";
 option java_package = "com.google.datastore.admin.v1";
diff --git a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
index dbbe473c9..f47cb70e1 100644
--- a/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
+++ b/proto-google-cloud-datastore-admin-v1/src/main/proto/google/datastore/admin/v1/migration.proto
@@ -17,7 +17,7 @@ syntax = "proto3";
 package google.datastore.admin.v1;
 
 option csharp_namespace = "Google.Cloud.Datastore.Admin.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/admin/v1;admin";
+option go_package = "cloud.google.com/go/datastore/admin/apiv1/adminpb;adminpb";
 option java_multiple_files = true;
 option java_outer_classname = "MigrationProto";
 option java_package = "com.google.datastore.admin.v1";