diff --git a/mmv1/products/cloudrun/Service.yaml b/mmv1/products/cloudrun/Service.yaml
index eef3cbea7f01..87f3be8ffb52 100644
--- a/mmv1/products/cloudrun/Service.yaml
+++ b/mmv1/products/cloudrun/Service.yaml
@@ -68,95 +68,118 @@ sweeper:
     - region: "us-central1"
     - region: "europe-west1"
     - region: "europe-north1"
-examples:
+samples:
   - name: 'cloud_run_service_basic'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-    test_env_vars:
-      project: 'PROJECT_NAME'
+    steps:
+      - name: 'cloud_run_service_basic'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+        test_env_vars:
+          project: 'PROJECT_NAME'
   - name: 'cloud_run_service_gpu'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-    test_env_vars:
-      project: 'PROJECT_NAME'
+    steps:
+      - name: 'cloud_run_service_gpu'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+        test_env_vars:
+          project: 'PROJECT_NAME'
   - name: 'cloud_run_service_sql'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-      cloud_run_sql_name: 'cloudrun-sql'
-      deletion_protection: 'true'
-    test_vars_overrides:
-      'deletion_protection': 'false'
-    oics_vars_overrides:
-      'deletion_protection': 'false'
-    ignore_read_extra:
-      - 'autogenerate_revision_name'
+    steps:
+      - name: 'cloud_run_service_sql'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+          cloud_run_sql_name: 'cloudrun-sql'
+        vars:
+          deletion_protection: 'true'
+        test_vars_overrides:
+          'deletion_protection': 'false'
+        oics_vars_overrides:
+          'deletion_protection': 'false'
+        ignore_read_extra:
+          - 'autogenerate_revision_name'
   - name: 'cloud_run_service_noauth'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-    test_env_vars:
-      project: 'PROJECT_NAME'
+    steps:
+      - name: 'cloud_run_service_noauth'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+        test_env_vars:
+          project: 'PROJECT_NAME'
   - name: 'cloud_run_service_multiple_environment_variables'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-    test_env_vars:
-      project: 'PROJECT_NAME'
-    ignore_read_extra:
-      - 'autogenerate_revision_name'
-    exclude_docs: true
+    exclude_basic_doc: true
+    steps:
+      - name: 'cloud_run_service_multiple_environment_variables'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+        test_env_vars:
+          project: 'PROJECT_NAME'
+        ignore_read_extra:
+          - 'autogenerate_revision_name'
   - name: 'cloud_run_service_secret_environment_variables'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-      secret_id: 'secret'
-    test_vars_overrides:
-      # for backward compatible
-      secret_id: '"secret" + randomSuffix'
-    test_env_vars:
-      project: 'PROJECT_NAME'
-    ignore_read_extra:
-      - 'autogenerate_revision_name'
-    exclude_docs: true
+    exclude_basic_doc: true
+    steps:
+      - name: 'cloud_run_service_secret_environment_variables'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+          secret_id: 'secret'
+        test_vars_overrides:
+          # for backward compatible
+          secret_id: '"secret" + randomSuffix'
+        test_env_vars:
+          project: 'PROJECT_NAME'
+        ignore_read_extra:
+          - 'autogenerate_revision_name'
   - name: 'cloud_run_service_secret_volumes'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-      secret_id: 'secret'
-    test_vars_overrides:
-      # for backward compatible
-      secret_id: '"secret" + randomSuffix'
-    test_env_vars:
-      project: 'PROJECT_NAME'
-    ignore_read_extra:
-      - 'autogenerate_revision_name'
-    exclude_docs: true
+    exclude_basic_doc: true
+    steps:
+      - name: 'cloud_run_service_secret_volumes'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+          secret_id: 'secret'
+        test_vars_overrides:
+          # for backward compatible
+          secret_id: '"secret" + randomSuffix'
+        test_env_vars:
+          project: 'PROJECT_NAME'
+        ignore_read_extra:
+          - 'autogenerate_revision_name'
   - name: 'cloud_run_service_probes'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
+    steps:
+      - name: 'cloud_run_service_probes'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
   - name: 'cloud_run_service_readiness_probe'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv-rp'
-    test_env_vars:
-      project: 'PROJECT_NAME'
+    steps:
+      - name: 'cloud_run_service_readiness_probe'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv-rp'
+        test_env_vars:
+          project: 'PROJECT_NAME'
   - name: 'cloud_run_service_multicontainer'
     primary_resource_id: 'default'
     min_version: 'beta'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-    test_env_vars:
-      project: 'PROJECT_NAME'
+    steps:
+      - name: 'cloud_run_service_multicontainer'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+        test_env_vars:
+          project: 'PROJECT_NAME'
   - name: 'cloud_run_service_iap'
     primary_resource_id: 'default'
-    vars:
-      cloud_run_service_name: 'cloudrun-srv'
-    test_env_vars:
-      project: 'PROJECT_NAME'
+    steps:
+      - name: 'cloud_run_service_iap'
+        resource_id_vars:
+          cloud_run_service_name: 'cloudrun-srv'
+        test_env_vars:
+          project: 'PROJECT_NAME'
 virtual_fields:
   - name: 'autogenerate_revision_name'
     description: |
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_basic.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_basic.tf.tmpl
similarity index 81%
rename from mmv1/templates/terraform/examples/cloud_run_service_basic.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_basic.tf.tmpl
index 2e2bf9c1fc51..1ebfc564932e 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_basic.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_basic.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_gpu.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_gpu.tf.tmpl
similarity index 91%
rename from mmv1/templates/terraform/examples/cloud_run_service_gpu.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_gpu.tf.tmpl
index 3a984bba23c0..06b5c816cfb7 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_gpu.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_gpu.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   metadata {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_iap.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_iap.tf.tmpl
similarity index 80%
rename from mmv1/templates/terraform/examples/cloud_run_service_iap.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_iap.tf.tmpl
index d0b6ed0b9e00..4471e3f70a95 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_iap.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_iap.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   metadata {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_multicontainer.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multicontainer.tf.tmpl
similarity index 94%
rename from mmv1/templates/terraform/examples/cloud_run_service_multicontainer.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multicontainer.tf.tmpl
index 018457894208..8a4dadf4427b 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_multicontainer.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multicontainer.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
   provider = google-beta
 
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_multiple_environment_variables.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multiple_environment_variables.tf.tmpl
similarity index 90%
rename from mmv1/templates/terraform/examples/cloud_run_service_multiple_environment_variables.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multiple_environment_variables.tf.tmpl
index 4a768b1a036a..5af6e3bcfb0f 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_multiple_environment_variables.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multiple_environment_variables.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_noauth.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_noauth.tf.tmpl
similarity index 90%
rename from mmv1/templates/terraform/examples/cloud_run_service_noauth.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_noauth.tf.tmpl
index be4c904ef2fe..5ff0f62ced33 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_noauth.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_noauth.tf.tmpl
@@ -1,6 +1,6 @@
 
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_probes.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_probes.tf.tmpl
similarity index 90%
rename from mmv1/templates/terraform/examples/cloud_run_service_probes.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_probes.tf.tmpl
index ed54ebdbb763..b2e60e57f144 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_probes.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_probes.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_readiness_probe.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_readiness_probe.tf.tmpl
similarity index 90%
rename from mmv1/templates/terraform/examples/cloud_run_service_readiness_probe.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_readiness_probe.tf.tmpl
index 894d49ba90f3..6341f5a68e17 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_readiness_probe.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_readiness_probe.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   metadata {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_environment_variables.tf.tmpl
similarity index 91%
rename from mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_environment_variables.tf.tmpl
index 93e25d4a9baf..0e73170ba93c 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_environment_variables.tf.tmpl
@@ -2,7 +2,7 @@ data "google_project" "project" {
 }
 
 resource "google_secret_manager_secret" "secret" {
-  secret_id = "{{index $.Vars "secret_id"}}"
+  secret_id = "{{index $.ResourceIdVars "secret_id"}}"
   replication {
     auto {}
   }
@@ -21,7 +21,7 @@ resource "google_secret_manager_secret_iam_member" "secret-access" {
 }
 
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_volumes.tf.tmpl
similarity index 92%
rename from mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_volumes.tf.tmpl
index 28db3c3b9c8d..b347258fa518 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_volumes.tf.tmpl
@@ -2,7 +2,7 @@ data "google_project" "project" {
 }
 
 resource "google_secret_manager_secret" "secret" {
-  secret_id = "{{index $.Vars "secret_id"}}"
+  secret_id = "{{index $.ResourceIdVars "secret_id"}}"
   replication {
     auto {}
   }
@@ -21,7 +21,7 @@ resource "google_secret_manager_secret_iam_member" "secret-access" {
 }
 
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
diff --git a/mmv1/templates/terraform/examples/cloud_run_service_sql.tf.tmpl b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_sql.tf.tmpl
similarity index 84%
rename from mmv1/templates/terraform/examples/cloud_run_service_sql.tf.tmpl
rename to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_sql.tf.tmpl
index d22ea4e38de1..025152780aad 100644
--- a/mmv1/templates/terraform/examples/cloud_run_service_sql.tf.tmpl
+++ b/mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_sql.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "cloud_run_service_name"}}"
+  name     = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
   location = "us-central1"
 
   template {
@@ -21,7 +21,7 @@ resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_sql_database_instance" "instance" {
-  name             = "{{index $.Vars "cloud_run_sql_name"}}"
+  name             = "{{index $.ResourceIdVars "cloud_run_sql_name"}}"
   region           = "us-east1"
   database_version = "MYSQL_5_7"
   settings {