diff --git a/mmv1/products/gemini/CodeRepositoryIndex.yaml b/mmv1/products/gemini/CodeRepositoryIndex.yaml
index 8794f700c104..9f6033e82a61 100644
--- a/mmv1/products/gemini/CodeRepositoryIndex.yaml
+++ b/mmv1/products/gemini/CodeRepositoryIndex.yaml
@@ -64,14 +64,12 @@ parameters:
   - name: location
     type: String
     description: The location of the Code Repository Index, for example `us-central1`.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
   - name: codeRepositoryIndexId
     type: String
     description: Required. Id of the Code Repository Index.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
@@ -79,7 +77,6 @@ properties:
   - name: updateTime
     type: String
     description: Output only. Update time stamp.
-    min_version: 'beta'
     output: true
   - name: state
     type: String
@@ -91,27 +88,22 @@ properties:
       ACTIVE
       DELETING
       SUSPENDED
-    min_version: 'beta'
     output: true
   - name: labels
     type: KeyValueLabels
     description: Optional. Labels as key value pairs.
-    min_version: 'beta'
   - name: kmsKey
     type: String
     description: |-
       Optional. Immutable. Customer-managed encryption key name, in the format
       projects/*/locations/*/keyRings/*/cryptoKeys/*.
-    min_version: 'beta'
     immutable: true
   - name: name
     type: String
     description: Immutable. Identifier. Name of Code Repository Index.
-    min_version: 'beta'
     output: true
     immutable: true
   - name: createTime
     type: String
     description: Output only. Create time stamp.
-    min_version: 'beta'
     output: true
diff --git a/mmv1/products/gemini/RepositoryGroup.yaml b/mmv1/products/gemini/RepositoryGroup.yaml
index d794f3668070..e19d65db96be 100644
--- a/mmv1/products/gemini/RepositoryGroup.yaml
+++ b/mmv1/products/gemini/RepositoryGroup.yaml
@@ -15,33 +15,32 @@
 name: RepositoryGroup
 description: The resource for managing Repository Group for Gemini Code Assist.
 min_version: 'beta'
-base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups
-self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}
-create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups?repositoryGroupId={{repository_group_id}}
+base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups
+self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
+create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups?repositoryGroupId={{repository_group_id}}
 update_verb: 'PATCH'
 update_mask: true
-id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}
+id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
 import_format:
-  - projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}
-mutex: 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}'
+  - projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}
+mutex: 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}'
 examples:
   - name: "gemini_repository_group_basic"
     min_version: 'beta'
     primary_resource_id: "example"
-    primary_resource_name: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-example%{random_suffix}", "us-central1", "", ""), "test-rg-repository-group-id"'
+    primary_resource_name: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-gen-example", "us-central1", "", map[string]string{}), fmt.Sprintf("tf-test-gen-repository-group-%s", context["random_suffix"])'
     vars:
-      repository_group_id: "example-repository-group-id"
+      repository_group_id: "gen-repository-group-"
       git_repository_link_id: 'example-git-repository-link-id'
       cri_id: "cri-example"
       repository_resource: "projects/example-project/locations/us-central1/connections/example-connection/gitRepositoryLinks/example-repo"
       connection_id: "example-connection-id"
     test_vars_overrides:
-      repository_group_id: '"example_repository_group_idx"'
       git_repository_link_id: 'acctest.BootstrapGitRepository(t, "basic", "us-central1", "https://github.com/CC-R-github-robot/tf-test.git", acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648))'
-      cri_id: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "test-rg", "us-central1", "", "")'
+      cri_id: 'acctest.BootstrapSharedCodeRepositoryIndex(t, "basic-rg-gen-example", "us-central1", "", map[string]string{})'
       repository_resource: '"projects/"+envvar.GetTestProjectFromEnv()+"/locations/us-central1/connections/"+acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)+"/gitRepositoryLinks/"+acctest.BootstrapGitRepository(t, "basic", "us-central1", "https://github.com/CC-R-github-robot/tf-test.git", acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648))'
       connection_id: 'acctest.BootstrapDeveloperConnection(t, "basic", "us-central1", "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)'
-    exclude_test: true
+    exclude_test: false
 timeouts:
   insert_minutes: 30
   update_minutes: 30
@@ -75,7 +74,7 @@ iam_policy:
   fetch_iam_policy_verb: 'GET'
   set_iam_policy_verb: 'POST'
   import_format:
-    - 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}/repositoryGroups/{{repository_group_id}}'
+    - 'projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index}}/repositoryGroups/{{repository_group_id}}'
     - '{{repository_group_id}}'
   allowed_iam_role: 'roles/cloudaicompanion.repositoryGroupsUser'
 error_retry_predicates:
@@ -85,21 +84,18 @@ parameters:
   - name: location
     type: String
     description: The location of the Code Repository Index, for example `us-central1`.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
-  - name: codeRepositoryIndexId
+  - name: codeRepositoryIndex
     type: String
     description: Required. Id of the Code Repository Index.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
   - name: repositoryGroupId
     type: String
     description: Required. Id of the Repository Group.
-    min_version: 'beta'
     immutable: true
     url_param_only: true
     required: true
@@ -107,7 +103,6 @@ properties:
   - name: repositories
     type: Array
     description: Required. List of repositories to group
-    min_version: 'beta'
     required: true
     item_type:
       type: NestedObject
@@ -117,32 +112,26 @@ properties:
           description: |-
             Required. The DeveloperConnect repository full resource name, relative resource name
             or resource URL to be indexed.
-          min_version: 'beta'
           required: true
         - name: branchPattern
           type: String
           description: |-
             Required. The Git branch pattern used for indexing in RE2 syntax.
             See https://github.com/google/re2/wiki/syntax for syntax.
-          min_version: 'beta'
           required: true
   - name: name
     type: String
     description: Immutable. Identifier. name of resource
-    min_version: 'beta'
     output: true
     immutable: true
   - name: createTime
     type: String
     description: Output only. Create time stamp
-    min_version: 'beta'
     output: true
   - name: updateTime
     type: String
     description: Output only. Update time stamp
-    min_version: 'beta'
     output: true
   - name: labels
     type: KeyValueLabels
     description: Optional. Labels as key value pairs
-    min_version: 'beta'
diff --git a/mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl b/mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl
index 6c238ad9be11..b5a043658356 100644
--- a/mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl
+++ b/mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl
@@ -1,7 +1,7 @@
 resource "google_gemini_repository_group" "example" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = "%{cri_id}"
+  code_repository_index = "%{cri_id}"
   repository_group_id = "{{index $.Vars "repository_group_id"}}"
   repositories {
     resource = "{{index $.Vars "repository_resource"}}"
diff --git a/mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go.tmpl
deleted file mode 100644
index 23041086dd6d..000000000000
--- a/mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go.tmpl
+++ /dev/null
@@ -1,290 +0,0 @@
-package gemini_test
-{{- if ne $.TargetVersionName "ga" }}
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
-
-	"github.com/hashicorp/terraform-provider-google/google/acctest"
-	"github.com/hashicorp/terraform-provider-google/google/envvar"
-)
-
-// To run tests locally please replace the `oauth_token_secret_version` with your secret manager version.
-// More details: https://cloud.google.com/developer-connect/docs/connect-github-repo#before_you_begin
-
-func TestAccGeminiRepositoryGroupIamBinding(t *testing.T) {
-	location := "us-central1"
-	codeRepositoryIndexId := acctest.BootstrapSharedCodeRepositoryIndex(t, "basic", location, "", map[string]string{"ccfe_debug_note": "terraform_e2e_should_be_deleted"})
-	developerConnectionId := acctest.BootstrapDeveloperConnection(t, "basic", location, "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)
-	gitRepositoryLinkId := acctest.BootstrapGitRepository(t, "basic", location, "https://github.com/CC-R-github-robot/tf-test.git", developerConnectionId)
-	repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10)
-
-	context := map[string]interface{}{
-		"role":                     "roles/cloudaicompanion.repositoryGroupsUser",
-		"code_repository_index_id": codeRepositoryIndexId,
-		"location":                 location,
-		"project":                  envvar.GetTestProjectFromEnv(),
-		"connection_id":            developerConnectionId,
-		"git_link_id":              gitRepositoryLinkId,
-		"repository_group_id":      repositoryGroupId,
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGeminiRepositoryGroupIamBinding_basic(context),
-			},
-			{
-				ResourceName:      "google_gemini_repository_group_iam_binding.foo",
-				ImportStateId:     fmt.Sprintf("projects/%s/locations/%s/codeRepositoryIndexes/%s/repositoryGroups/%s roles/cloudaicompanion.repositoryGroupsUser", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), codeRepositoryIndexId, repositoryGroupId),
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				// Test Iam Binding update
-				Config: testAccGeminiRepositoryGroupIamBinding_update(context),
-			},
-			{
-				ResourceName:      "google_gemini_repository_group_iam_binding.foo",
-				ImportStateId:     fmt.Sprintf("projects/%s/locations/%s/codeRepositoryIndexes/%s/repositoryGroups/%s roles/cloudaicompanion.repositoryGroupsUser", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), codeRepositoryIndexId, repositoryGroupId),
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func TestAccGeminiRepositoryGroupIamMember(t *testing.T) {
-	location := "us-central1"
-	codeRepositoryIndexId := acctest.BootstrapSharedCodeRepositoryIndex(t, "basic", location, "", map[string]string{"ccfe_debug_note": "terraform_e2e_should_be_deleted"})
-	developerConnectionId := acctest.BootstrapDeveloperConnection(t, "basic", location, "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)
-	gitRepositoryLinkId := acctest.BootstrapGitRepository(t, "basic", location, "https://github.com/CC-R-github-robot/tf-test.git", developerConnectionId)
-	repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10)
-
-	context := map[string]interface{}{
-		"role":                     "roles/cloudaicompanion.repositoryGroupsUser",
-		"code_repository_index_id": codeRepositoryIndexId,
-		"location":                 location,
-		"project":                  envvar.GetTestProjectFromEnv(),
-		"connection_id":            developerConnectionId,
-		"git_link_id":              gitRepositoryLinkId,
-		"repository_group_id":      repositoryGroupId,
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
-		Steps: []resource.TestStep{
-			{
-				// Test Iam Member creation (no update for member, no need to test)
-				Config: testAccGeminiRepositoryGroupIamMember_basic(context),
-			},
-			{
-				ResourceName:      "google_gemini_repository_group_iam_member.foo",
-				ImportStateId:     fmt.Sprintf("projects/%s/locations/%s/codeRepositoryIndexes/%s/repositoryGroups/%s roles/cloudaicompanion.repositoryGroupsUser user:admin@hashicorptest.com", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), codeRepositoryIndexId, repositoryGroupId),
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func TestAccGeminiRepositoryGroupIamPolicy(t *testing.T) {
-	location := "us-central1"
-	codeRepositoryIndexId := acctest.BootstrapSharedCodeRepositoryIndex(t, "basic", location, "", map[string]string{"ccfe_debug_note": "terraform_e2e_should_be_deleted"})
-	developerConnectionId := acctest.BootstrapDeveloperConnection(t, "basic", location, "projects/502367051001/secrets/tf-test-cloudaicompanion-github-oauthtoken-c42e5c/versions/1", 54180648)
-	gitRepositoryLinkId := acctest.BootstrapGitRepository(t, "basic", location, "https://github.com/CC-R-github-robot/tf-test.git", developerConnectionId)
-	repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10)
-
-	context := map[string]interface{}{
-		"role":                     "roles/cloudaicompanion.repositoryGroupsUser",
-		"code_repository_index_id": codeRepositoryIndexId,
-		"location":                 location,
-		"project":                  envvar.GetTestProjectFromEnv(),
-		"connection_id":            developerConnectionId,
-		"git_link_id":              gitRepositoryLinkId,
-		"repository_group_id":      repositoryGroupId,
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGeminiRepositoryGroupIamPolicy_basic(context),
-				Check:  resource.TestCheckResourceAttrSet("data.google_gemini_repository_group_iam_policy.foo", "policy_data"),
-			},
-			{
-				ResourceName:      "google_gemini_repository_group_iam_policy.foo",
-				ImportStateId:     fmt.Sprintf("projects/%s/locations/%s/codeRepositoryIndexes/%s/repositoryGroups/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), codeRepositoryIndexId, repositoryGroupId),
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: testAccGeminiRepositoryGroupIamPolicy_emptyBinding(context),
-			},
-			{
-				ResourceName:      "google_gemini_repository_group_iam_policy.foo",
-				ImportStateId:     fmt.Sprintf("projects/%s/locations/%s/codeRepositoryIndexes/%s/repositoryGroups/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), codeRepositoryIndexId, repositoryGroupId),
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func testAccGeminiRepositoryGroupIamMember_basic(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_gemini_repository_group_iam_member" "foo" {
-  provider = google-beta
-  project = "%{project}"
-  location = "%{location}"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = google_gemini_repository_group.example.repository_group_id
-  role = "%{role}"
-  member = "user:admin@hashicorptest.com"
-}
-
-resource "google_gemini_repository_group" "example" {
-  provider = google-beta
-  location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = "%{repository_group_id}"
-  repositories {
-    resource = "projects/%{project}/locations/us-central1/connections/%{connection_id}/gitRepositoryLinks/%{git_link_id}"
-    branch_pattern = "main"
-  }
-  labels = {"label1": "value1"}
-}
-`, context)
-}
-
-func testAccGeminiRepositoryGroupIamPolicy_basic(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-data "google_iam_policy" "foo" {
-  provider = google-beta
-  binding {
-    role = "%{role}"
-    members = ["user:admin@hashicorptest.com"]
-  }
-}
-
-resource "google_gemini_repository_group_iam_policy" "foo" {
-  provider = google-beta
-  project = "%{project}"
-  location = "%{location}"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = google_gemini_repository_group.example.repository_group_id
-  policy_data = data.google_iam_policy.foo.policy_data
-}
-
-data "google_gemini_repository_group_iam_policy" "foo" {
-  provider = google-beta
-  project = "%{project}"
-  location = "%{location}"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = google_gemini_repository_group.example.repository_group_id
-  depends_on = [
-    google_gemini_repository_group_iam_policy.foo
-  ]
-}
-
-resource "google_gemini_repository_group" "example" {
-  provider = google-beta
-  location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = "%{repository_group_id}"
-  repositories {
-    resource = "projects/%{project}/locations/us-central1/connections/%{connection_id}/gitRepositoryLinks/%{git_link_id}"
-    branch_pattern = "main"
-  }
-  labels = {"label1": "value1"}
-}
-`, context)
-}
-
-func testAccGeminiRepositoryGroupIamPolicy_emptyBinding(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-data "google_iam_policy" "foo" {
-  provider = google-beta
-}
-
-resource "google_gemini_repository_group_iam_policy" "foo" {
-  provider = google-beta
-  project = "%{project}"
-  location = "%{location}"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = google_gemini_repository_group.example.repository_group_id
-  policy_data = data.google_iam_policy.foo.policy_data
-}
-
-resource "google_gemini_repository_group" "example" {
-  provider = google-beta
-  location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = "%{repository_group_id}"
-  repositories {
-    resource = "projects/%{project}/locations/us-central1/connections/%{connection_id}/gitRepositoryLinks/%{git_link_id}"
-    branch_pattern = "main"
-  }
-  labels = {"label1": "value1"}
-}
-`, context)
-}
-
-func testAccGeminiRepositoryGroupIamBinding_basic(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_gemini_repository_group_iam_binding" "foo" {
-  provider = google-beta
-  project = "%{project}"
-  location = "%{location}"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = google_gemini_repository_group.example.repository_group_id
-  role = "%{role}"
-  members = ["user:admin@hashicorptest.com"]
-}
-
-resource "google_gemini_repository_group" "example" {
-  provider = google-beta
-  location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = "%{repository_group_id}"
-  repositories {
-    resource = "projects/%{project}/locations/us-central1/connections/%{connection_id}/gitRepositoryLinks/%{git_link_id}"
-    branch_pattern = "main"
-  }
-  labels = {"label1": "value1"}
-}
-`, context)
-}
-
-func testAccGeminiRepositoryGroupIamBinding_update(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_gemini_repository_group_iam_binding" "foo" {
-  provider = google-beta
-  project = "%{project}"
-  location = "%{location}"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = google_gemini_repository_group.example.repository_group_id
-  role = "%{role}"
-  members = ["user:admin@hashicorptest.com", "user:gterraformtest1@gmail.com"]
-}
-
-resource "google_gemini_repository_group" "example" {
-  provider = google-beta
-  location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
-  repository_group_id = "%{repository_group_id}"
-  repositories {
-    resource = "projects/%{project}/locations/us-central1/connections/%{connection_id}/gitRepositoryLinks/%{git_link_id}"
-    branch_pattern = "main"
-  }
-  labels = {"label1": "value1"}
-}
-`, context)
-}
-{{ end }}
diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go.tmpl
index 255b04911515..931e861b908e 100644
--- a/mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go.tmpl
+++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go.tmpl
@@ -18,7 +18,7 @@ func TestAccGeminiRepositoryGroup_update(t *testing.T) {
 	context := map[string]interface{}{
 		"random_suffix": acctest.RandString(t, 10),
 		"project_id":               os.Getenv("GOOGLE_PROJECT"),
-		"code_repository_index_id": codeRepositoryIndexId,
+		"code_repository_index": codeRepositoryIndexId,
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -32,7 +32,7 @@ func TestAccGeminiRepositoryGroup_update(t *testing.T) {
 				ResourceName:            "google_gemini_repository_group.example",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"code_repository_index_id", "labels", "location", "repository_group_id", "terraform_labels"},
+				ImportStateVerifyIgnore: []string{"code_repository_index", "labels", "location", "repository_group_id", "terraform_labels"},
 			},
 			{
 				Config: testAccGeminiRepositoryGroup_update(context),
@@ -41,7 +41,7 @@ func TestAccGeminiRepositoryGroup_update(t *testing.T) {
 				ResourceName:            "google_gemini_repository_group.example",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"code_repository_index_id", "labels", "location", "repository_group_id", "terraform_labels"},
+				ImportStateVerifyIgnore: []string{"code_repository_index", "labels", "location", "repository_group_id", "terraform_labels"},
 			},
 		},
 	})
@@ -64,7 +64,7 @@ func TestAccGeminiRepositoryGroup_noBootstrap(t *testing.T) {
 				ResourceName:            "google_gemini_repository_group.example_e",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"code_repository_index_id", "labels", "location", "repository_group_id", "terraform_labels"},
+				ImportStateVerifyIgnore: []string{"code_repository_index", "labels", "location", "repository_group_id", "terraform_labels"},
 			},
 		},
 	})
@@ -75,7 +75,7 @@ func testAccGeminiRepositoryGroup_basic(context map[string]interface{}) string {
 resource "google_gemini_repository_group" "example" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
+  code_repository_index = "%{code_repository_index}"
   repository_group_id = "tf-test-rg-repository-group-id-%{random_suffix}" 
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"
@@ -115,7 +115,7 @@ func testAccGeminiRepositoryGroup_update(context map[string]interface{}) string
 resource "google_gemini_repository_group" "example" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = "%{code_repository_index_id}"
+  code_repository_index = "%{code_repository_index}"
   repository_group_id = "tf-test-rg-repository-group-id-%{random_suffix}"
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"
@@ -163,7 +163,7 @@ resource "google_gemini_code_repository_index" "cri" {
 resource "google_gemini_repository_group" "example_a" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = google_gemini_code_repository_index.cri.code_repository_index_id
+  code_repository_index = google_gemini_code_repository_index.cri.code_repository_index_id
   repository_group_id = "tf-test-rg-nb-repository-group-id1-%{random_suffix}"
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"
@@ -175,7 +175,7 @@ resource "google_gemini_repository_group" "example_a" {
 resource "google_gemini_repository_group" "example_b" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = google_gemini_code_repository_index.cri.code_repository_index_id
+  code_repository_index = google_gemini_code_repository_index.cri.code_repository_index_id
   repository_group_id = "tf-test-rg-nb-repository-group-id2-%{random_suffix}"
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"
@@ -187,7 +187,7 @@ resource "google_gemini_repository_group" "example_b" {
 resource "google_gemini_repository_group" "example_c" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = google_gemini_code_repository_index.cri.code_repository_index_id
+  code_repository_index = google_gemini_code_repository_index.cri.code_repository_index_id
   repository_group_id = "tf-test-rg-nb-repository-group-id3-%{random_suffix}"
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"
@@ -199,7 +199,7 @@ resource "google_gemini_repository_group" "example_c" {
 resource "google_gemini_repository_group" "example_d" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = google_gemini_code_repository_index.cri.code_repository_index_id
+  code_repository_index = google_gemini_code_repository_index.cri.code_repository_index_id
   repository_group_id = "tf-test-rg-nb-repository-group-id4-%{random_suffix}"
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"
@@ -211,7 +211,7 @@ resource "google_gemini_repository_group" "example_d" {
 resource "google_gemini_repository_group" "example_e" {
   provider = google-beta
   location = "us-central1"
-  code_repository_index_id = google_gemini_code_repository_index.cri.code_repository_index_id
+  code_repository_index = google_gemini_code_repository_index.cri.code_repository_index_id
   repository_group_id = "tf-test-rg-nb-repository-group-id5-%{random_suffix}"
   repositories {
     resource = "projects/%{project_id}/locations/us-central1/connections/${google_developer_connect_connection.github_conn.connection_id}/gitRepositoryLinks/${google_developer_connect_git_repository_link.conn.git_repository_link_id}"