diff --git a/tpgtools/overrides/firebaserules/samples/release/firestore_release.tf.tmpl b/tpgtools/overrides/firebaserules/samples/release/firestore_release.tf.tmpl
index 3d41ea93c6cf..f88267b16a2e 100644
--- a/tpgtools/overrides/firebaserules/samples/release/firestore_release.tf.tmpl
+++ b/tpgtools/overrides/firebaserules/samples/release/firestore_release.tf.tmpl
@@ -1,5 +1,5 @@
 resource "google_firebaserules_release" "primary" {
-  name         = "cloud.firestore"
+  name         = "cloud.firestore/{{database}}"
   ruleset_name = "projects/{{project}}/rulesets/${google_firebaserules_ruleset.firestore.name}"
   project      = "{{project}}"
 
diff --git a/tpgtools/overrides/firebaserules/samples/release/firestore_release.yaml b/tpgtools/overrides/firebaserules/samples/release/firestore_release.yaml
index 814b4c37d22a..4a8a4112e96a 100644
--- a/tpgtools/overrides/firebaserules/samples/release/firestore_release.yaml
+++ b/tpgtools/overrides/firebaserules/samples/release/firestore_release.yaml
@@ -20,4 +20,6 @@ versions:
 resource: ./firestore_release.tf.tmpl
 variables:
 - name: project
-  type: project
\ No newline at end of file
+  type: project
+- name: database
+  type: resource_name
\ No newline at end of file