diff --git a/mmv1/products/firestore/Index.yaml b/mmv1/products/firestore/Index.yaml
index 06a76d2af452..d96f36e65f9c 100644
--- a/mmv1/products/firestore/Index.yaml
+++ b/mmv1/products/firestore/Index.yaml
@@ -60,19 +60,18 @@ examples:
     primary_resource_id:
       'my-index'
     vars:
-      project_id: "project-id"
+      database_id: "database-id"
     test_env_vars:
-      org_id: :ORG_ID
+      project_id: :PROJECT_NAME
     pull_external: true
   - !ruby/object:Provider::Terraform::Examples
     name: 'firestore_index_datastore_mode'
     primary_resource_id:
       'my-index'
+    vars:
+      database_id: "database-id-dm"
     test_env_vars:
-      # This example relies on a well-known collection having been created and
-      # Firestore being enabled on the project. We can't do that automatically
-      # for Datastore mode so we need a pre-created project.
-      project_id: :FIRESTORE_PROJECT_NAME
+      project_id: :PROJECT_NAME
 custom_code: !ruby/object:Provider::Terraform::CustomCode
   custom_import: templates/terraform/custom_import/index_self_link_as_name_set_project.go.erb
   encoder: templates/terraform/encoders/index.go.erb
diff --git a/mmv1/templates/terraform/examples/firestore_index_basic.tf.erb b/mmv1/templates/terraform/examples/firestore_index_basic.tf.erb
index 0b3c2cd71548..b706e3be2817 100644
--- a/mmv1/templates/terraform/examples/firestore_index_basic.tf.erb
+++ b/mmv1/templates/terraform/examples/firestore_index_basic.tf.erb
@@ -1,45 +1,17 @@
-resource "google_project" "project" {
-  project_id = "<%= ctx[:vars]['project_id'] %>"
-  name       = "<%= ctx[:vars]['project_id'] %>"
-  org_id     = "<%= ctx[:test_env_vars]['org_id'] %>"
-}
-
-resource "time_sleep" "wait_60_seconds" {
-  depends_on = [google_project.project]
-
-  create_duration = "60s"
-}
-
-resource "google_project_service" "firestore" {
-  project = google_project.project.project_id
-  service = "firestore.googleapis.com"
-
-  # Needed for CI tests for permissions to propagate, should not be needed for actual usage
-  depends_on = [time_sleep.wait_60_seconds]
-}
-
 resource "google_firestore_database" "database" {
-  project     = google_project.project.project_id
-  name        = "(default)"
+  project     = "<%= ctx[:test_env_vars]['project_id'] %>"
+  name        = "<%= ctx[:vars]['database_id'] %>"
   location_id = "nam5"
   type        = "FIRESTORE_NATIVE"
 
-  depends_on = [google_project_service.firestore]
-}
-
-# Creating a document also creates its collection
-resource "google_firestore_document" "document" {
-  project     = google_project.project.project_id
-  database    = google_firestore_database.database.name
-  collection  = "somenewcollection"
-  document_id = "<%= ctx[:vars]['document_id'] %>"
-  fields      = "{\"something\":{\"mapValue\":{\"fields\":{\"akey\":{\"stringValue\":\"avalue\"}}}}}"
+  delete_protection_state = "DELETE_PROTECTION_DISABLED"
+  deletion_policy         = "DELETE"
 }
 
 resource "google_firestore_index" "<%= ctx[:primary_resource_id] %>" {
-  project    = google_project.project.project_id
+  project     = "<%= ctx[:test_env_vars]['project_id'] %>"
   database   = google_firestore_database.database.name
-  collection = google_firestore_document.document.collection
+  collection = "atestcollection"
 
   fields {
     field_path = "name"
@@ -50,5 +22,4 @@ resource "google_firestore_index" "<%= ctx[:primary_resource_id] %>" {
     field_path = "description"
     order      = "DESCENDING"
   }
-
 }
diff --git a/mmv1/templates/terraform/examples/firestore_index_datastore_mode.tf.erb b/mmv1/templates/terraform/examples/firestore_index_datastore_mode.tf.erb
index bc944770c839..4ec2fc640954 100644
--- a/mmv1/templates/terraform/examples/firestore_index_datastore_mode.tf.erb
+++ b/mmv1/templates/terraform/examples/firestore_index_datastore_mode.tf.erb
@@ -1,7 +1,17 @@
+resource "google_firestore_database" "database" {
+  project     = "<%= ctx[:test_env_vars]['project_id'] %>"
+  name        = "<%= ctx[:vars]['database_id'] %>"
+  location_id = "nam5"
+  type        = "DATASTORE_MODE"
+
+  delete_protection_state = "DELETE_PROTECTION_DISABLED"
+  deletion_policy         = "DELETE"
+}
+
 resource "google_firestore_index" "<%= ctx[:primary_resource_id] %>" {
-  project    = "<%= ctx[:test_env_vars]['project_id'] %>"
-  database   = "(default)"
-  collection = "chatrooms"
+  project     = "<%= ctx[:test_env_vars]['project_id'] %>"
+  database   = google_firestore_database.database.name
+  collection = "atestcollection"
 
   query_scope = "COLLECTION_RECURSIVE"
   api_scope = "DATASTORE_MODE_API"