diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7785b8928..a752a2d88 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -83,7 +83,7 @@ repos:
     entry: python3 tools/duplicate-diff.py
     language: python
     language_version: python3
-    files: '.*(\.sh|\.tf|\.tftpl|\.tpl)$'
+    files: '.*(\.sh|\.tf|\.tftpl|\.tpl|\.yaml)$'
     pass_filenames: true
     require_serial: true
 
diff --git a/fast/stages/2-networking-a-simple/data/dns-policy-rules.yaml b/fast/stages/2-networking-a-simple/data/dns-policy-rules.yaml
index 4539b249a..b23b626f0 100644
--- a/fast/stages/2-networking-a-simple/data/dns-policy-rules.yaml
+++ b/fast/stages/2-networking-a-simple/data/dns-policy-rules.yaml
@@ -13,6 +13,13 @@ aiplatform-notebook-cloud-all:
 aiplatform-notebook-gu-all:
   dns_name: "*.aiplatform-notebook.googleusercontent.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+appengine:
+  dns_name: "appengine.google.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+appspot-all:
+  dns_name: "*.appspot.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+
 backupdr-cloud:
   dns_name: "backupdr.cloud.google.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
@@ -106,6 +113,9 @@ kernels-gu-all:
 ltsapis-all:
   dns_name: "*.ltsapis.goog."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+notebooks:
+  dns_name: "notebooks.cloud.google.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
 notebooks-all:
   dns_name: "*.notebooks.cloud.google.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
diff --git a/fast/stages/2-networking-b-nva/data/dns-policy-rules.yaml b/fast/stages/2-networking-b-nva/data/dns-policy-rules.yaml
index 4539b249a..b23b626f0 100644
--- a/fast/stages/2-networking-b-nva/data/dns-policy-rules.yaml
+++ b/fast/stages/2-networking-b-nva/data/dns-policy-rules.yaml
@@ -13,6 +13,13 @@ aiplatform-notebook-cloud-all:
 aiplatform-notebook-gu-all:
   dns_name: "*.aiplatform-notebook.googleusercontent.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+appengine:
+  dns_name: "appengine.google.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+appspot-all:
+  dns_name: "*.appspot.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+
 backupdr-cloud:
   dns_name: "backupdr.cloud.google.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
@@ -106,6 +113,9 @@ kernels-gu-all:
 ltsapis-all:
   dns_name: "*.ltsapis.goog."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+notebooks:
+  dns_name: "notebooks.cloud.google.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
 notebooks-all:
   dns_name: "*.notebooks.cloud.google.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
diff --git a/fast/stages/2-networking-c-separate-envs/data/dns-policy-rules.yaml b/fast/stages/2-networking-c-separate-envs/data/dns-policy-rules.yaml
index 4539b249a..b23b626f0 100644
--- a/fast/stages/2-networking-c-separate-envs/data/dns-policy-rules.yaml
+++ b/fast/stages/2-networking-c-separate-envs/data/dns-policy-rules.yaml
@@ -13,6 +13,13 @@ aiplatform-notebook-cloud-all:
 aiplatform-notebook-gu-all:
   dns_name: "*.aiplatform-notebook.googleusercontent.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+appengine:
+  dns_name: "appengine.google.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+appspot-all:
+  dns_name: "*.appspot.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+
 backupdr-cloud:
   dns_name: "backupdr.cloud.google.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
@@ -106,6 +113,9 @@ kernels-gu-all:
 ltsapis-all:
   dns_name: "*.ltsapis.goog."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
+notebooks:
+  dns_name: "notebooks.cloud.google.com."
+  local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
 notebooks-all:
   dns_name: "*.notebooks.cloud.google.com."
   local_data: { CNAME: { rrdatas: ["private.googleapis.com."] } }
diff --git a/tests/fast/stages/s2_networking_a_simple/ncc.yaml b/tests/fast/stages/s2_networking_a_simple/ncc.yaml
index ae8be7a36..09d4db45c 100644
--- a/tests/fast/stages/s2_networking_a_simple/ncc.yaml
+++ b/tests/fast/stages/s2_networking_a_simple/ncc.yaml
@@ -27,7 +27,7 @@ counts:
   google_dns_policy: 3
   google_dns_record_set: 3
   google_dns_response_policy: 1
-  google_dns_response_policy_rule: 39
+  google_dns_response_policy_rule: 42
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 2
   google_monitoring_dashboard: 3
@@ -42,4 +42,4 @@ counts:
   google_storage_bucket_object: 2
   google_tags_tag_binding: 3
   modules: 23
-  resources: 186
+  resources: 189
diff --git a/tests/fast/stages/s2_networking_a_simple/simple.yaml b/tests/fast/stages/s2_networking_a_simple/simple.yaml
index 8b6a89ee1..add5be060 100644
--- a/tests/fast/stages/s2_networking_a_simple/simple.yaml
+++ b/tests/fast/stages/s2_networking_a_simple/simple.yaml
@@ -33,7 +33,7 @@ counts:
   google_dns_policy: 3
   google_dns_record_set: 3
   google_dns_response_policy: 1
-  google_dns_response_policy_rule: 39
+  google_dns_response_policy_rule: 42
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 2
   google_monitoring_dashboard: 3
@@ -47,4 +47,4 @@ counts:
   google_tags_tag_binding: 3
   modules: 28
   random_id: 3
-  resources: 203
+  resources: 206
diff --git a/tests/fast/stages/s2_networking_a_simple/vpn.yaml b/tests/fast/stages/s2_networking_a_simple/vpn.yaml
index 172b66022..8443a904d 100644
--- a/tests/fast/stages/s2_networking_a_simple/vpn.yaml
+++ b/tests/fast/stages/s2_networking_a_simple/vpn.yaml
@@ -31,7 +31,7 @@ counts:
   google_dns_policy: 3
   google_dns_record_set: 3
   google_dns_response_policy: 1
-  google_dns_response_policy_rule: 39
+  google_dns_response_policy_rule: 42
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 2
   google_monitoring_dashboard: 3
@@ -45,4 +45,4 @@ counts:
   google_tags_tag_binding: 3
   modules: 30
   random_id: 17
-  resources: 250
+  resources: 253
diff --git a/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml b/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
index 46100698b..e5560b5b1 100644
--- a/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
+++ b/tests/fast/stages/s2_networking_b_nva/ncc-ra.yaml
@@ -34,7 +34,7 @@ counts:
   google_dns_policy: 4
   google_dns_record_set: 3
   google_dns_response_policy: 1
-  google_dns_response_policy_rule: 39
+  google_dns_response_policy_rule: 42
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 2
   google_monitoring_dashboard: 3
@@ -50,4 +50,4 @@ counts:
   google_tags_tag_binding: 3
   modules: 38
   random_id: 6
-  resources: 270
+  resources: 273
diff --git a/tests/fast/stages/s2_networking_b_nva/regional.yaml b/tests/fast/stages/s2_networking_b_nva/regional.yaml
index 077540f21..cee53e755 100644
--- a/tests/fast/stages/s2_networking_b_nva/regional.yaml
+++ b/tests/fast/stages/s2_networking_b_nva/regional.yaml
@@ -38,7 +38,7 @@ counts:
   google_dns_policy: 6
   google_dns_record_set: 3
   google_dns_response_policy: 1
-  google_dns_response_policy_rule: 39
+  google_dns_response_policy_rule: 42
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 2
   google_monitoring_dashboard: 3
@@ -52,4 +52,4 @@ counts:
   google_tags_tag_binding: 3
   modules: 46
   random_id: 6
-  resources: 280
+  resources: 283
diff --git a/tests/fast/stages/s2_networking_b_nva/simple.yaml b/tests/fast/stages/s2_networking_b_nva/simple.yaml
index 4c64cd84d..b2c876a2b 100644
--- a/tests/fast/stages/s2_networking_b_nva/simple.yaml
+++ b/tests/fast/stages/s2_networking_b_nva/simple.yaml
@@ -38,7 +38,7 @@ counts:
   google_dns_policy: 4
   google_dns_record_set: 3
   google_dns_response_policy: 1
-  google_dns_response_policy_rule: 39
+  google_dns_response_policy_rule: 42
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 2
   google_monitoring_dashboard: 3
@@ -52,4 +52,4 @@ counts:
   google_tags_tag_binding: 3
   modules: 42
   random_id: 6
-  resources: 256
+  resources: 259
diff --git a/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml b/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
index 9928af5de..ce5be6be6 100644
--- a/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
+++ b/tests/fast/stages/s2_networking_c_separate_envs/simple.yaml
@@ -32,7 +32,7 @@ counts:
   google_dns_policy: 2
   google_dns_record_set: 2
   google_dns_response_policy: 2
-  google_dns_response_policy_rule: 78
+  google_dns_response_policy_rule: 84
   google_essential_contacts_contact: 1
   google_monitoring_alert_policy: 4
   google_monitoring_dashboard: 6
@@ -45,4 +45,4 @@ counts:
   google_tags_tag_binding: 2
   modules: 22
   random_id: 6
-  resources: 223
+  resources: 229
diff --git a/tools/duplicate-diff.py b/tools/duplicate-diff.py
index 14850b93b..9fb1c2cd4 100755
--- a/tools/duplicate-diff.py
+++ b/tools/duplicate-diff.py
@@ -27,6 +27,16 @@ duplicates = [
     [
         "fast/stages/0-bootstrap/identity-providers-wfif-defs.tf",
         "fast/stages/2-secops/identity-providers-defs.tf",
+    ],
+    [
+        "fast/stages/2-networking-a-simple/data/dns-policy-rules.yaml",
+        "fast/stages/2-networking-b-nva/data/dns-policy-rules.yaml",
+        "fast/stages/2-networking-c-separate-envs/data/dns-policy-rules.yaml",
+    ],
+    [
+        "fast/stages/2-networking-a-simple/data/cidrs.yaml",
+        "fast/stages/2-networking-b-nva/data/cidrs.yaml",
+        "fast/stages/2-networking-c-separate-envs/data/cidrs.yaml",
     ]
 ]