diff --git a/mmv1/products/metastore/Federation.yaml b/mmv1/products/metastore/Federation.yaml
index fbcac6ed22a2..1a9d671b1569 100644
--- a/mmv1/products/metastore/Federation.yaml
+++ b/mmv1/products/metastore/Federation.yaml
@@ -51,7 +51,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_federation_basic'
-    skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
     primary_resource_id: 'default'
     primary_resource_name:
       'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
@@ -60,7 +59,6 @@ examples:
       service_id: 'metastore-service'
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_federation_bigquery'
-    skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
     primary_resource_id: 'default'
     primary_resource_name:
       'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
diff --git a/mmv1/products/metastore/Service.yaml b/mmv1/products/metastore/Service.yaml
index 1836c904df2b..121c5261e63f 100644
--- a/mmv1/products/metastore/Service.yaml
+++ b/mmv1/products/metastore/Service.yaml
@@ -83,7 +83,6 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_service_endpoint'
     skip_docs: true
-    skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
     primary_resource_id: 'endpoint'
     vars:
       metastore_service_name: 'metastore-endpoint'
diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_federation_basic.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_federation_basic.tf.erb
index 52d6a8329017..6ec9e8fdff35 100644
--- a/mmv1/templates/terraform/examples/dataproc_metastore_federation_basic.tf.erb
+++ b/mmv1/templates/terraform/examples/dataproc_metastore_federation_basic.tf.erb
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %>" {
   location      = "us-central1"
-  federation_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  federation_id = "<%= ctx[:vars]['federation_id'] %>"
   version       = "3.1.2"
 
   backend_metastores {
@@ -11,7 +11,7 @@ resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %
 }
 
 resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
-  service_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  service_id = "<%= ctx[:vars]['service_id'] %>"
   location   = "us-central1"
   tier       = "DEVELOPER"
 
diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_federation_bigquery.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_federation_bigquery.tf.erb
index 696b886726a4..64f760359549 100644
--- a/mmv1/templates/terraform/examples/dataproc_metastore_federation_bigquery.tf.erb
+++ b/mmv1/templates/terraform/examples/dataproc_metastore_federation_bigquery.tf.erb
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %>" {
   location      = "us-central1"
-  federation_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  federation_id = "<%= ctx[:vars]['federation_id'] %>"
   version       = "3.1.2"
 
   backend_metastores {
@@ -17,7 +17,7 @@ resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %
 }
 
 resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
-  service_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  service_id = "<%= ctx[:vars]['service_id'] %>"
   location   = "us-central1"
   tier       = "DEVELOPER"
 
diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_service_private_service_connect.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_service_private_service_connect.tf.erb
index 564949ed8477..01cfb57ba8bb 100644
--- a/mmv1/templates/terraform/examples/dataproc_metastore_service_private_service_connect.tf.erb
+++ b/mmv1/templates/terraform/examples/dataproc_metastore_service_private_service_connect.tf.erb
@@ -14,6 +14,7 @@ resource "google_compute_subnetwork" "subnet" {
 resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
   service_id = "<%= ctx[:vars]['metastore_service_name'] %>"
   location   = "us-central1"
+  tier       = "DEVELOPER"
 
   hive_metastore_config {
     version = "3.1.2"
diff --git a/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_basic.tf.tmpl
index a567f0d3c370..46a80cc4e7e3 100644
--- a/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_basic.tf.tmpl
+++ b/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_basic.tf.tmpl
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
   location      = "us-central1"
-  federation_id = "{{index $.Vars "metastore_federation_name"}}"
+  federation_id = "{{index $.Vars "federation_id"}}"
   version       = "3.1.2"
 
   backend_metastores {
@@ -11,7 +11,7 @@ resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_dataproc_metastore_service" "{{$.PrimaryResourceId}}" {
-  service_id = "{{index $.Vars "metastore_federation_name"}}"
+  service_id = "{{index $.Vars "service_id"}}"
   location   = "us-central1"
   tier       = "DEVELOPER"
 
diff --git a/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_bigquery.tf.tmpl b/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_bigquery.tf.tmpl
index 5e2a4cadd81f..4d22834f235c 100644
--- a/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_bigquery.tf.tmpl
+++ b/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_bigquery.tf.tmpl
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
   location      = "us-central1"
-  federation_id = "{{index $.Vars "metastore_federation_name"}}"
+  federation_id = "{{index $.Vars "federation_id"}}"
   version       = "3.1.2"
 
   backend_metastores {
@@ -17,7 +17,7 @@ resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_dataproc_metastore_service" "{{$.PrimaryResourceId}}" {
-  service_id = "{{index $.Vars "metastore_federation_name"}}"
+  service_id = "{{index $.Vars "service_id"}}"
   location   = "us-central1"
   tier       = "DEVELOPER"
 
diff --git a/mmv1/templates/terraform/examples/go/dataproc_metastore_service_private_service_connect.tf.tmpl b/mmv1/templates/terraform/examples/go/dataproc_metastore_service_private_service_connect.tf.tmpl
index 72447a11e06f..5b07bf408e5c 100644
--- a/mmv1/templates/terraform/examples/go/dataproc_metastore_service_private_service_connect.tf.tmpl
+++ b/mmv1/templates/terraform/examples/go/dataproc_metastore_service_private_service_connect.tf.tmpl
@@ -14,6 +14,7 @@ resource "google_compute_subnetwork" "subnet" {
 resource "google_dataproc_metastore_service" "{{$.PrimaryResourceId}}" {
   service_id = "{{index $.Vars "metastore_service_name"}}"
   location   = "us-central1"
+  tier       = "DEVELOPER"
 
   hive_metastore_config {
     version = "3.1.2"