diff --git a/.semgrep.yml b/.semgrep.yml
index 986045cd78..6fecbfaa03 100644
--- a/.semgrep.yml
+++ b/.semgrep.yml
@@ -40,7 +40,9 @@ rules:
         - 'docs/'
         - 'examples/'
         - 'templates/'
-    fix: zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
+    fix-regex:
+      regex: (zone_id\s*=\s*)\".*\"
+      replacement: \1"0da42c8d2132a9ddaf714f9e7c920711"
     patterns:
       - pattern: zone_id = "..."
       - pattern-not: zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
@@ -64,7 +66,9 @@ rules:
         - 'docs/'
         - 'examples/'
         - 'templates/'
-    fix: account_id = "f037e56e89293a057740de681ac9abbe"
+    fix-regex:
+      regex: (account_id\s*=\s*)\".*\"
+      replacement: \1"f037e56e89293a057740de681ac9abbe"
     patterns:
       - pattern: account_id = "..."
       - pattern-not: account_id = "f037e56e89293a057740de681ac9abbe"
diff --git a/docs/resources/access_application.md b/docs/resources/access_application.md
index 7618f109b8..3bf11a0e63 100644
--- a/docs/resources/access_application.md
+++ b/docs/resources/access_application.md
@@ -23,7 +23,7 @@ zone needs to use the `zone_id` argument.
 
 ```terraform
 resource "cloudflare_access_application" "staging_app" {
-  zone_id                   = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  zone_id                   = "0da42c8d2132a9ddaf714f9e7c920711"
   name                      = "staging application"
   domain                    = "staging.example.com"
   type                      = "self_hosted"
@@ -33,7 +33,7 @@ resource "cloudflare_access_application" "staging_app" {
 
 # With CORS configuration
 resource "cloudflare_access_application" "staging_app" {
-  zone_id          = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  zone_id          = "0da42c8d2132a9ddaf714f9e7c920711"
   name             = "staging application"
   domain           = "staging.example.com"
   type             = "self_hosted"
diff --git a/docs/resources/access_bookmark.md b/docs/resources/access_bookmark.md
index c6d2c69024..d6359bff33 100644
--- a/docs/resources/access_bookmark.md
+++ b/docs/resources/access_bookmark.md
@@ -19,7 +19,7 @@ zone needs to use the `zone_id` argument.
 
 ```terraform
 resource "cloudflare_access_bookmark" "my_bookmark_app" {
-  account_id           = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id           = "f037e56e89293a057740de681ac9abbe"
   name                 = "My Bookmark App"
   domain               = "example.com"
   logo_url             = "https://example.com/example.png"
diff --git a/docs/resources/access_ca_certificate.md b/docs/resources/access_ca_certificate.md
index 106fc2f0df..6e2c5ad85f 100644
--- a/docs/resources/access_ca_certificate.md
+++ b/docs/resources/access_ca_certificate.md
@@ -20,13 +20,13 @@ zone needs to use the `zone_id` argument.
 ```terraform
 # account level
 resource "cloudflare_access_ca_certificate" "example" {
-  account_id     = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id     = "f037e56e89293a057740de681ac9abbe"
   application_id = "6cd6cea3-3ef2-4542-9aea-85a0bbcd5414"
 }
 
 # zone level
 resource "cloudflare_access_ca_certificate" "another_example" {
-  zone_id        = "b6bc7eb6027c792a6bca3dc91fd2d7e0"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   application_id = "fe2be0ff-7f13-4350-8c8e-a9b9795fe3c2"
 }
 ```
diff --git a/docs/resources/access_group.md b/docs/resources/access_group.md
index 6030d0ca2e..5d515d2181 100644
--- a/docs/resources/access_group.md
+++ b/docs/resources/access_group.md
@@ -20,7 +20,7 @@ zone needs to use the `zone_id` argument.
 ```terraform
 # Allowing access to `test@example.com` email address only
 resource "cloudflare_access_group" "test_group" {
-  account_id = "975ecf5a45e3bcb680dba0722a420ad9"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "staging group"
 
   include {
@@ -31,7 +31,7 @@ resource "cloudflare_access_group" "test_group" {
 # Allowing `test@example.com` to access but only when coming from a
 # specific IP.
 resource "cloudflare_access_group" "test_group" {
-  account_id = "975ecf5a45e3bcb680dba0722a420ad9"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "staging group"
 
   include {
diff --git a/docs/resources/access_identity_provider.md b/docs/resources/access_identity_provider.md
index c3bc16c6f5..eb40bb604b 100644
--- a/docs/resources/access_identity_provider.md
+++ b/docs/resources/access_identity_provider.md
@@ -20,14 +20,14 @@ zone needs to use the `zone_id` argument.
 ```terraform
 # one time pin
 resource "cloudflare_access_identity_provider" "pin_login" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "PIN login"
   type       = "onetimepin"
 }
 
 # oauth
 resource "cloudflare_access_identity_provider" "github_oauth" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "GitHub OAuth"
   type       = "github"
   config {
@@ -38,7 +38,7 @@ resource "cloudflare_access_identity_provider" "github_oauth" {
 
 # saml
 resource "cloudflare_access_identity_provider" "jumpcloud_saml" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "JumpCloud SAML"
   type       = "saml"
   config {
@@ -52,7 +52,7 @@ resource "cloudflare_access_identity_provider" "jumpcloud_saml" {
 
 # okta
 resource "cloudflare_access_identity_provider" "okta" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "Okta"
   type       = "okta"
   config {
diff --git a/docs/resources/access_mutual_tls_certificate.md b/docs/resources/access_mutual_tls_certificate.md
index 065addbee5..2495931759 100644
--- a/docs/resources/access_mutual_tls_certificate.md
+++ b/docs/resources/access_mutual_tls_certificate.md
@@ -19,7 +19,7 @@ zone needs to use the `zone_id` argument.
 
 ```terraform
 resource "cloudflare_access_mutual_tls_certificate" "my_cert" {
-  zone_id              = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  zone_id              = "0da42c8d2132a9ddaf714f9e7c920711"
   name                 = "My Root Cert"
   certificate          = var.ca_pem
   associated_hostnames = ["staging.example.com"]
diff --git a/docs/resources/access_policy.md b/docs/resources/access_policy.md
index 6b58da1c9c..497898cc12 100644
--- a/docs/resources/access_policy.md
+++ b/docs/resources/access_policy.md
@@ -21,7 +21,7 @@ zone needs to use the `zone_id` argument.
 # Allowing access to `test@example.com` email address only
 resource "cloudflare_access_policy" "test_policy" {
   application_id = "cb029e245cfdd66dc8d2e570d5dd3322"
-  zone_id        = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   name           = "staging policy"
   precedence     = "1"
   decision       = "allow"
@@ -39,7 +39,7 @@ resource "cloudflare_access_policy" "test_policy" {
 # specific IP.
 resource "cloudflare_access_policy" "test_policy" {
   application_id = "cb029e245cfdd66dc8d2e570d5dd3322"
-  zone_id        = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   name           = "staging policy"
   precedence     = "1"
   decision       = "allow"
diff --git a/docs/resources/access_rule.md b/docs/resources/access_rule.md
index f1d2daca3f..2431cc45d0 100644
--- a/docs/resources/access_rule.md
+++ b/docs/resources/access_rule.md
@@ -30,7 +30,7 @@ resource "cloudflare_access_rule" "antarctica" {
     target = "country"
     value  = "AQ"
   }
-  zone_id = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
 }
 
 # Whitelist office's network IP ranges on all account zones (or other lists of resources).
diff --git a/docs/resources/access_service_token.md b/docs/resources/access_service_token.md
index 491bfe86eb..d38a440fc9 100644
--- a/docs/resources/access_service_token.md
+++ b/docs/resources/access_service_token.md
@@ -13,13 +13,13 @@ Access Service Tokens are used for service-to-service communication when an appl
 
 ```terraform
 resource "cloudflare_access_service_token" "my_app" {
-  account_id = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "CI/CD app"
 }
 
 # Generate a service token that will renew if terraform is ran within 30 days of expiration
 resource "cloudflare_access_service_token" "my_app" {
-  account_id = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "CI/CD app renewed"
 
   min_days_for_renewal = 30
diff --git a/docs/resources/argo.md b/docs/resources/argo.md
index 8a23f107c8..c31c869336 100644
--- a/docs/resources/argo.md
+++ b/docs/resources/argo.md
@@ -13,7 +13,7 @@ Cloudflare Argo controls the routing to your origin and tiered caching options t
 
 ```terraform
 resource "cloudflare_argo" "example" {
-  zone_id        = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   tiered_caching = "on"
   smart_routing  = "on"
 }
diff --git a/docs/resources/filter.md b/docs/resources/filter.md
index 7a6f7a8c7c..aae8df9e6b 100644
--- a/docs/resources/filter.md
+++ b/docs/resources/filter.md
@@ -13,7 +13,7 @@ Filter expressions that can be referenced across multiple features, e.g. Firewal
 
 ```terraform
 resource "cloudflare_filter" "wordpress" {
-  zone_id     = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   description = "Wordpress break-in attempts that are outside of the office"
   expression  = "(http.request.uri.path ~ \".*wp-login.php\" or http.request.uri.path ~ \".*xmlrpc.php\") and ip.src ne 192.0.2.1"
 }
diff --git a/docs/resources/firewall_rule.md b/docs/resources/firewall_rule.md
index ca777c3b20..d0b5a4b4c6 100644
--- a/docs/resources/firewall_rule.md
+++ b/docs/resources/firewall_rule.md
@@ -22,13 +22,13 @@ Filter expressions needs to be created first before using Firewall Rule.
 
 ```terraform
 resource "cloudflare_filter" "wordpress" {
-  zone_id     = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   description = "Wordpress break-in attempts that are outside of the office"
   expression  = "(http.request.uri.path ~ \".*wp-login.php\" or http.request.uri.path ~ \".*xmlrpc.php\") and ip.src ne 192.0.2.1"
 }
 
 resource "cloudflare_firewall_rule" "wordpress" {
-  zone_id     = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   description = "Block wordpress break-in attempts"
   filter_id   = cloudflare_filter.wordpress.id
   action      = "block"
diff --git a/docs/resources/ipsec_tunnel.md b/docs/resources/ipsec_tunnel.md
index 51bd5c0d6d..9f4c791316 100644
--- a/docs/resources/ipsec_tunnel.md
+++ b/docs/resources/ipsec_tunnel.md
@@ -13,7 +13,7 @@ Provides a resource, that manages IPsec tunnels for Magic Transit.
 
 ```terraform
 resource "cloudflare_ipsec_tunnel" "example" {
-  account_id           = "c4a7362d577a6c3019a474fd6f485821"
+  account_id           = "f037e56e89293a057740de681ac9abbe"
   name                 = "IPsec_1"
   customer_endpoint    = "203.0.113.1"
   cloudflare_endpoint  = "203.0.113.1"
diff --git a/docs/resources/list.md b/docs/resources/list.md
index 5d6eb15a29..78867c9850 100644
--- a/docs/resources/list.md
+++ b/docs/resources/list.md
@@ -14,7 +14,7 @@ Provides Lists (IPs, Redirects) to be used in Edge Rules Engine across all zones
 ```terraform
 # IP list
 resource "cloudflare_list" "example" {
-  account_id  = "919f297a62fdfb28844177128ed4d331"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "example list"
   description = "example IPs for a list"
   kind        = "ip"
@@ -36,7 +36,7 @@ resource "cloudflare_list" "example" {
 
 # Redirect list
 resource "cloudflare_list" "example" {
-  account_id  = "919f297a62fdfb28844177128ed4d331"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "example list"
   description = "example redirects for a list"
   kind        = "redirect"
diff --git a/docs/resources/logpush_job.md b/docs/resources/logpush_job.md
index 793715dcbb..b35e459be8 100644
--- a/docs/resources/logpush_job.md
+++ b/docs/resources/logpush_job.md
@@ -63,7 +63,7 @@ resource "cloudflare_logpush_job" "http_requests" {
 # must match identically in all resources. Otherwise the challenge validation
 # will fail.
 resource "cloudflare_logpush_ownership_challenge" "ownership_challenge" {
-  zone_id          = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id          = "0da42c8d2132a9ddaf714f9e7c920711"
   destination_conf = "s3://my-bucket-path?region=us-west-2"
 }
 
@@ -74,7 +74,7 @@ data "aws_s3_bucket_object" "challenge_file" {
 
 resource "cloudflare_logpush_job" "example_job" {
   enabled             = true
-  zone_id             = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id             = "0da42c8d2132a9ddaf714f9e7c920711"
   name                = "My-logpush-job"
   logpull_options     = "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339"
   destination_conf    = "s3://my-bucket-path?region=us-west-2"
@@ -87,7 +87,7 @@ resource "cloudflare_logpush_job" "example_job" {
 # 1. Create `cloudflare_logpush_ownership_challenge` resource
 
 resource "cloudflare_logpush_ownership_challenge" "ownership_challenge" {
-  zone_id          = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id          = "0da42c8d2132a9ddaf714f9e7c920711"
   destination_conf = "s3://my-bucket-path?region=us-west-2"
 }
 
@@ -95,7 +95,7 @@ resource "cloudflare_logpush_ownership_challenge" "ownership_challenge" {
 # 3. Create the `cloudflare_logpush_job` substituting in your manual `ownership_challenge`.
 resource "cloudflare_logpush_job" "example_job" {
   enabled             = true
-  zone_id             = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id             = "0da42c8d2132a9ddaf714f9e7c920711"
   name                = "My-logpush-job"
   logpull_options     = "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339"
   destination_conf    = "s3://my-bucket-path?region=us-west-2"
diff --git a/docs/resources/managed_headers.md b/docs/resources/managed_headers.md
index 80e23ad9a6..1cd9f5ff25 100644
--- a/docs/resources/managed_headers.md
+++ b/docs/resources/managed_headers.md
@@ -19,7 +19,7 @@ Terraform will override your configuration if it exists.
 ```terraform
 # Enable security headers using Managed Meaders
 resource "cloudflare_managed_headers" "example" {
-  zone_id = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
 
   managed_request_headers {
     id      = "add_true_client_ip_headers"
diff --git a/docs/resources/notification_policy.md b/docs/resources/notification_policy.md
index 625d410f74..a90acda3f7 100644
--- a/docs/resources/notification_policy.md
+++ b/docs/resources/notification_policy.md
@@ -13,7 +13,7 @@ Provides a resource, that manages a notification policy for Cloudflare's product
 
 ```terraform
 resource "cloudflare_notification_policy" "example" {
-  account_id  = "c4a7362d577a6c3019a474fd6f485821"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "Policy for SSL notification events"
   description = "Notification policy to alert when my SSL certificates are modified"
   enabled     = true
@@ -34,7 +34,7 @@ resource "cloudflare_notification_policy" "example" {
 
 ### With Filters
 resource "cloudflare_notification_policy" "example" {
-  account_id  = "c4a7362d577a6c3019a474fd6f485821"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "Policy for Healthcheck notification"
   description = "Notification policy to alert on unhealthy Healthcheck status"
   enabled     = true
diff --git a/docs/resources/ruleset.md b/docs/resources/ruleset.md
index 5e9bb4ee41..a78e4a63ae 100644
--- a/docs/resources/ruleset.md
+++ b/docs/resources/ruleset.md
@@ -35,7 +35,7 @@ have inconsistent operations and inadvertently disable rulesets.
 ```terraform
 # Magic Transit
 resource "cloudflare_ruleset" "magic_transit_example" {
-  account_id  = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "account magic transit"
   description = "example magic transit ruleset description"
   kind        = "root"
@@ -50,7 +50,7 @@ resource "cloudflare_ruleset" "magic_transit_example" {
 
 # Zone-level WAF Managed Ruleset
 resource "cloudflare_ruleset" "zone_level_managed_waf" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "managed WAF"
   description = "managed WAF ruleset description"
   kind        = "zone"
@@ -69,7 +69,7 @@ resource "cloudflare_ruleset" "zone_level_managed_waf" {
 
 # Zone-level WAF with tag-based overrides
 resource "cloudflare_ruleset" "zone_level_managed_waf_with_category_based_overrides" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "managed WAF with tag-based overrides"
   description = "managed WAF with tag-based overrides ruleset description"
   kind        = "zone"
@@ -102,7 +102,7 @@ resource "cloudflare_ruleset" "zone_level_managed_waf_with_category_based_overri
 
 # Rewrite the URI path component to a static path
 resource "cloudflare_ruleset" "transform_uri_rule_path" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "transform rule for URI path"
   description = "change the URI path to a new static path"
   kind        = "zone"
@@ -126,7 +126,7 @@ resource "cloudflare_ruleset" "transform_uri_rule_path" {
 
 # Rewrite the URI query component to a static query
 resource "cloudflare_ruleset" "transform_uri_rule_query" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "transform rule for URI query parameter"
   description = "change the URI query to a new static query"
   kind        = "zone"
@@ -150,7 +150,7 @@ resource "cloudflare_ruleset" "transform_uri_rule_query" {
 
 # Rewrite HTTP headers to a modified values
 resource "cloudflare_ruleset" "transform_uri_http_headers" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "transform rule for HTTP headers"
   description = "modify HTTP headers before reaching origin"
   kind        = "zone"
@@ -185,7 +185,7 @@ resource "cloudflare_ruleset" "transform_uri_http_headers" {
 
 # HTTP rate limit for an API route
 resource "cloudflare_ruleset" "rate_limiting_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "restrict API requests count"
   description = "apply HTTP rate limiting for a route"
   kind        = "zone"
@@ -211,7 +211,7 @@ resource "cloudflare_ruleset" "rate_limiting_example" {
 
 # Change origin for an API route
 resource "cloudflare_ruleset" "http_origin_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "Change to some origin"
   description = "Change origin for a route"
   kind        = "zone"
@@ -234,7 +234,7 @@ resource "cloudflare_ruleset" "http_origin_example" {
 
 # Custom fields logging
 resource "cloudflare_ruleset" "custom_fields_logging_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "log custom fields"
   description = "add custom fields to logging"
   kind        = "zone"
@@ -268,7 +268,7 @@ resource "cloudflare_ruleset" "custom_fields_logging_example" {
 
 # Custom cache keys + settings
 resource "cloudflare_ruleset" "cache_settings_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "set cache settings"
   description = "set cache settings for the request"
   kind        = "zone"
diff --git a/docs/resources/tunnel_route.md b/docs/resources/tunnel_route.md
index 23450e1753..1e227e002a 100644
--- a/docs/resources/tunnel_route.md
+++ b/docs/resources/tunnel_route.md
@@ -14,7 +14,7 @@ Provides a resource, that manages Cloudflare tunnel routes for Zero Trust. Tunne
 ```terraform
 # Tunnel route
 resource "cloudflare_tunnel_route" "example" {
-  account_id         = "c4a7362d577a6c3019a474fd6f485821"
+  account_id         = "f037e56e89293a057740de681ac9abbe"
   tunnel_id          = "f70ff985-a4ef-4643-bbbc-4a0ed4fc8415"
   network            = "192.0.2.24/32"
   comment            = "New tunnel route for documentation"
@@ -23,13 +23,13 @@ resource "cloudflare_tunnel_route" "example" {
 
 # Tunnel with tunnel route
 resource "cloudflare_argo_tunnel" "tunnel" {
-  account_id = "c4a7362d577a6c3019a474fd6f485821"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "my_tunnel"
   secret     = "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg="
 }
 
 resource "cloudflare_tunnel_route" "example" {
-  account_id         = "c4a7362d577a6c3019a474fd6f485821"
+  account_id         = "f037e56e89293a057740de681ac9abbe"
   tunnel_id          = cloudflare_argo_tunnel.tunnel.id
   network            = "192.0.2.24/32"
   comment            = "New tunnel route for documentation"
diff --git a/docs/resources/tunnel_virtual_network.md b/docs/resources/tunnel_virtual_network.md
index 44c653fe89..1ceaf6679a 100644
--- a/docs/resources/tunnel_virtual_network.md
+++ b/docs/resources/tunnel_virtual_network.md
@@ -17,7 +17,7 @@ handle overlapping private IPs in your origins.
 
 ```terraform
 resource "cloudflare_tunnel_virtual_network" "example" {
-  account_id = "c4a7362d577a6c3019a474fd6f485821"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name = "vnet-for-documentation"
   comment = "New tunnel virtual network for documentation"
 }
diff --git a/docs/resources/waiting_room.md b/docs/resources/waiting_room.md
index 641c5a86ee..45bf210567 100644
--- a/docs/resources/waiting_room.md
+++ b/docs/resources/waiting_room.md
@@ -14,7 +14,7 @@ Provides a Cloudflare Waiting Room resource.
 ```terraform
 # Waiting Room
 resource "cloudflare_waiting_room" "example" {
-  zone_id              = "ae36f999674d196762efcc5abb06b345"
+  zone_id              = "0da42c8d2132a9ddaf714f9e7c920711"
   name                 = "foo"
   host                 = "foo.example.com"
   path                 = "/"
diff --git a/docs/resources/waiting_room_event.md b/docs/resources/waiting_room_event.md
index 25336c1f26..b4cc520622 100644
--- a/docs/resources/waiting_room_event.md
+++ b/docs/resources/waiting_room_event.md
@@ -14,7 +14,7 @@ Provides a Cloudflare Waiting Room Event resource.
 ```terraform
 # Waiting Room Event
 resource "cloudflare_waiting_room_event" "example" {
-  zone_id              = "ae36f999674d196762efcc5abb06b345"
+  zone_id              = "0da42c8d2132a9ddaf714f9e7c920711"
   waiting_room_id      = "d41d8cd98f00b204e9800998ecf8427e"
   name                 = "foo"
   event_start_time     = "2006-01-02T15:04:05Z"
diff --git a/docs/resources/zone.md b/docs/resources/zone.md
index 1181dd7ef3..4ea7b4907e 100644
--- a/docs/resources/zone.md
+++ b/docs/resources/zone.md
@@ -15,7 +15,7 @@ Provides a Cloudflare Zone resource. Zone is the basic resource for working with
 
 ```terraform
 resource "cloudflare_zone" "example" {
-  account_id = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   zone       = "example.com"
 }
 ```
diff --git a/examples/resources/cloudflare_access_application/resource.tf b/examples/resources/cloudflare_access_application/resource.tf
index 0919e03919..14c7399f40 100644
--- a/examples/resources/cloudflare_access_application/resource.tf
+++ b/examples/resources/cloudflare_access_application/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_access_application" "staging_app" {
-  zone_id                   = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  zone_id                   = "0da42c8d2132a9ddaf714f9e7c920711"
   name                      = "staging application"
   domain                    = "staging.example.com"
   type                      = "self_hosted"
@@ -9,7 +9,7 @@ resource "cloudflare_access_application" "staging_app" {
 
 # With CORS configuration
 resource "cloudflare_access_application" "staging_app" {
-  zone_id          = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  zone_id          = "0da42c8d2132a9ddaf714f9e7c920711"
   name             = "staging application"
   domain           = "staging.example.com"
   type             = "self_hosted"
diff --git a/examples/resources/cloudflare_access_bookmark/resource.tf b/examples/resources/cloudflare_access_bookmark/resource.tf
index 80dea89f09..d840653465 100644
--- a/examples/resources/cloudflare_access_bookmark/resource.tf
+++ b/examples/resources/cloudflare_access_bookmark/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_access_bookmark" "my_bookmark_app" {
-  account_id           = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id           = "f037e56e89293a057740de681ac9abbe"
   name                 = "My Bookmark App"
   domain               = "example.com"
   logo_url             = "https://example.com/example.png"
diff --git a/examples/resources/cloudflare_access_ca_certificate/resource.tf b/examples/resources/cloudflare_access_ca_certificate/resource.tf
index 6721ef2b10..38ef192ba8 100644
--- a/examples/resources/cloudflare_access_ca_certificate/resource.tf
+++ b/examples/resources/cloudflare_access_ca_certificate/resource.tf
@@ -1,11 +1,11 @@
 # account level
 resource "cloudflare_access_ca_certificate" "example" {
-  account_id     = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id     = "f037e56e89293a057740de681ac9abbe"
   application_id = "6cd6cea3-3ef2-4542-9aea-85a0bbcd5414"
 }
 
 # zone level
 resource "cloudflare_access_ca_certificate" "another_example" {
-  zone_id        = "b6bc7eb6027c792a6bca3dc91fd2d7e0"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   application_id = "fe2be0ff-7f13-4350-8c8e-a9b9795fe3c2"
 }
diff --git a/examples/resources/cloudflare_access_group/resource.tf b/examples/resources/cloudflare_access_group/resource.tf
index c2f689e53a..2559a0ae1e 100644
--- a/examples/resources/cloudflare_access_group/resource.tf
+++ b/examples/resources/cloudflare_access_group/resource.tf
@@ -1,6 +1,6 @@
 # Allowing access to `test@example.com` email address only
 resource "cloudflare_access_group" "test_group" {
-  account_id = "975ecf5a45e3bcb680dba0722a420ad9"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "staging group"
 
   include {
@@ -11,7 +11,7 @@ resource "cloudflare_access_group" "test_group" {
 # Allowing `test@example.com` to access but only when coming from a
 # specific IP.
 resource "cloudflare_access_group" "test_group" {
-  account_id = "975ecf5a45e3bcb680dba0722a420ad9"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "staging group"
 
   include {
diff --git a/examples/resources/cloudflare_access_identity_provider/resource.tf b/examples/resources/cloudflare_access_identity_provider/resource.tf
index aea342faf4..32e3b1a05b 100644
--- a/examples/resources/cloudflare_access_identity_provider/resource.tf
+++ b/examples/resources/cloudflare_access_identity_provider/resource.tf
@@ -1,13 +1,13 @@
 # one time pin
 resource "cloudflare_access_identity_provider" "pin_login" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "PIN login"
   type       = "onetimepin"
 }
 
 # oauth
 resource "cloudflare_access_identity_provider" "github_oauth" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "GitHub OAuth"
   type       = "github"
   config {
@@ -18,7 +18,7 @@ resource "cloudflare_access_identity_provider" "github_oauth" {
 
 # saml
 resource "cloudflare_access_identity_provider" "jumpcloud_saml" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "JumpCloud SAML"
   type       = "saml"
   config {
@@ -32,7 +32,7 @@ resource "cloudflare_access_identity_provider" "jumpcloud_saml" {
 
 # okta
 resource "cloudflare_access_identity_provider" "okta" {
-  account_id = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "Okta"
   type       = "okta"
   config {
diff --git a/examples/resources/cloudflare_access_mutual_tls_certificate/resource.tf b/examples/resources/cloudflare_access_mutual_tls_certificate/resource.tf
index 92376f746c..6add966e03 100644
--- a/examples/resources/cloudflare_access_mutual_tls_certificate/resource.tf
+++ b/examples/resources/cloudflare_access_mutual_tls_certificate/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_access_mutual_tls_certificate" "my_cert" {
-  zone_id              = "1d5fdc9e88c8a8c4518b068cd94331fe"
+  zone_id              = "0da42c8d2132a9ddaf714f9e7c920711"
   name                 = "My Root Cert"
   certificate          = var.ca_pem
   associated_hostnames = ["staging.example.com"]
diff --git a/examples/resources/cloudflare_access_policy/resource.tf b/examples/resources/cloudflare_access_policy/resource.tf
index 3b00fcee39..57bd5bf996 100644
--- a/examples/resources/cloudflare_access_policy/resource.tf
+++ b/examples/resources/cloudflare_access_policy/resource.tf
@@ -1,7 +1,7 @@
 # Allowing access to `test@example.com` email address only
 resource "cloudflare_access_policy" "test_policy" {
   application_id = "cb029e245cfdd66dc8d2e570d5dd3322"
-  zone_id        = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   name           = "staging policy"
   precedence     = "1"
   decision       = "allow"
@@ -19,7 +19,7 @@ resource "cloudflare_access_policy" "test_policy" {
 # specific IP.
 resource "cloudflare_access_policy" "test_policy" {
   application_id = "cb029e245cfdd66dc8d2e570d5dd3322"
-  zone_id        = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   name           = "staging policy"
   precedence     = "1"
   decision       = "allow"
diff --git a/examples/resources/cloudflare_access_rule/resource.tf b/examples/resources/cloudflare_access_rule/resource.tf
index 6245ed5b16..f2f70350c8 100644
--- a/examples/resources/cloudflare_access_rule/resource.tf
+++ b/examples/resources/cloudflare_access_rule/resource.tf
@@ -16,7 +16,7 @@ resource "cloudflare_access_rule" "antarctica" {
     target = "country"
     value  = "AQ"
   }
-  zone_id = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
 }
 
 # Whitelist office's network IP ranges on all account zones (or other lists of resources).
diff --git a/examples/resources/cloudflare_access_service_token/resource.tf b/examples/resources/cloudflare_access_service_token/resource.tf
index 587753d1b9..6fee47735f 100644
--- a/examples/resources/cloudflare_access_service_token/resource.tf
+++ b/examples/resources/cloudflare_access_service_token/resource.tf
@@ -1,11 +1,11 @@
 resource "cloudflare_access_service_token" "my_app" {
-  account_id = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "CI/CD app"
 }
 
 # Generate a service token that will renew if terraform is ran within 30 days of expiration
 resource "cloudflare_access_service_token" "my_app" {
-  account_id = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "CI/CD app renewed"
 
   min_days_for_renewal = 30
diff --git a/examples/resources/cloudflare_argo/resource.tf b/examples/resources/cloudflare_argo/resource.tf
index 4a834732fb..436b781408 100644
--- a/examples/resources/cloudflare_argo/resource.tf
+++ b/examples/resources/cloudflare_argo/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_argo" "example" {
-  zone_id        = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id        = "0da42c8d2132a9ddaf714f9e7c920711"
   tiered_caching = "on"
   smart_routing  = "on"
 }
diff --git a/examples/resources/cloudflare_filter/resource.tf b/examples/resources/cloudflare_filter/resource.tf
index ab6f60fe4a..81bf4566a8 100644
--- a/examples/resources/cloudflare_filter/resource.tf
+++ b/examples/resources/cloudflare_filter/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_filter" "wordpress" {
-  zone_id     = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   description = "Wordpress break-in attempts that are outside of the office"
   expression  = "(http.request.uri.path ~ \".*wp-login.php\" or http.request.uri.path ~ \".*xmlrpc.php\") and ip.src ne 192.0.2.1"
 }
diff --git a/examples/resources/cloudflare_firewall_rule/resource.tf b/examples/resources/cloudflare_firewall_rule/resource.tf
index 5ba3e35288..3b925ea1c9 100644
--- a/examples/resources/cloudflare_firewall_rule/resource.tf
+++ b/examples/resources/cloudflare_firewall_rule/resource.tf
@@ -1,11 +1,11 @@
 resource "cloudflare_filter" "wordpress" {
-  zone_id     = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   description = "Wordpress break-in attempts that are outside of the office"
   expression  = "(http.request.uri.path ~ \".*wp-login.php\" or http.request.uri.path ~ \".*xmlrpc.php\") and ip.src ne 192.0.2.1"
 }
 
 resource "cloudflare_firewall_rule" "wordpress" {
-  zone_id     = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   description = "Block wordpress break-in attempts"
   filter_id   = cloudflare_filter.wordpress.id
   action      = "block"
diff --git a/examples/resources/cloudflare_ipsec_tunnel/resource.tf b/examples/resources/cloudflare_ipsec_tunnel/resource.tf
index 0b0446776c..47a6d66a06 100644
--- a/examples/resources/cloudflare_ipsec_tunnel/resource.tf
+++ b/examples/resources/cloudflare_ipsec_tunnel/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_ipsec_tunnel" "example" {
-  account_id           = "c4a7362d577a6c3019a474fd6f485821"
+  account_id           = "f037e56e89293a057740de681ac9abbe"
   name                 = "IPsec_1"
   customer_endpoint    = "203.0.113.1"
   cloudflare_endpoint  = "203.0.113.1"
diff --git a/examples/resources/cloudflare_list/resource.tf b/examples/resources/cloudflare_list/resource.tf
index 1ff93291e0..fd2bce605e 100644
--- a/examples/resources/cloudflare_list/resource.tf
+++ b/examples/resources/cloudflare_list/resource.tf
@@ -1,6 +1,6 @@
 # IP list
 resource "cloudflare_list" "example" {
-  account_id  = "919f297a62fdfb28844177128ed4d331"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "example list"
   description = "example IPs for a list"
   kind        = "ip"
@@ -22,7 +22,7 @@ resource "cloudflare_list" "example" {
 
 # Redirect list
 resource "cloudflare_list" "example" {
-  account_id  = "919f297a62fdfb28844177128ed4d331"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "example list"
   description = "example redirects for a list"
   kind        = "redirect"
diff --git a/examples/resources/cloudflare_logpush_job/resource.tf b/examples/resources/cloudflare_logpush_job/resource.tf
index 94a2f70330..cb95e33f60 100644
--- a/examples/resources/cloudflare_logpush_job/resource.tf
+++ b/examples/resources/cloudflare_logpush_job/resource.tf
@@ -35,7 +35,7 @@ resource "cloudflare_logpush_job" "http_requests" {
 # must match identically in all resources. Otherwise the challenge validation
 # will fail.
 resource "cloudflare_logpush_ownership_challenge" "ownership_challenge" {
-  zone_id          = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id          = "0da42c8d2132a9ddaf714f9e7c920711"
   destination_conf = "s3://my-bucket-path?region=us-west-2"
 }
 
@@ -46,7 +46,7 @@ data "aws_s3_bucket_object" "challenge_file" {
 
 resource "cloudflare_logpush_job" "example_job" {
   enabled             = true
-  zone_id             = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id             = "0da42c8d2132a9ddaf714f9e7c920711"
   name                = "My-logpush-job"
   logpull_options     = "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339"
   destination_conf    = "s3://my-bucket-path?region=us-west-2"
@@ -59,7 +59,7 @@ resource "cloudflare_logpush_job" "example_job" {
 # 1. Create `cloudflare_logpush_ownership_challenge` resource
 
 resource "cloudflare_logpush_ownership_challenge" "ownership_challenge" {
-  zone_id          = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id          = "0da42c8d2132a9ddaf714f9e7c920711"
   destination_conf = "s3://my-bucket-path?region=us-west-2"
 }
 
@@ -67,7 +67,7 @@ resource "cloudflare_logpush_ownership_challenge" "ownership_challenge" {
 # 3. Create the `cloudflare_logpush_job` substituting in your manual `ownership_challenge`.
 resource "cloudflare_logpush_job" "example_job" {
   enabled             = true
-  zone_id             = "d41d8cd98f00b204e9800998ecf8427e"
+  zone_id             = "0da42c8d2132a9ddaf714f9e7c920711"
   name                = "My-logpush-job"
   logpull_options     = "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339"
   destination_conf    = "s3://my-bucket-path?region=us-west-2"
diff --git a/examples/resources/cloudflare_managed_headers/resource.tf b/examples/resources/cloudflare_managed_headers/resource.tf
index 9d68bff743..0465eeed10 100644
--- a/examples/resources/cloudflare_managed_headers/resource.tf
+++ b/examples/resources/cloudflare_managed_headers/resource.tf
@@ -1,6 +1,6 @@
 # Enable security headers using Managed Meaders
 resource "cloudflare_managed_headers" "example" {
-  zone_id = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
 
   managed_request_headers {
     id      = "add_true_client_ip_headers"
diff --git a/examples/resources/cloudflare_notification_policy/resource.tf b/examples/resources/cloudflare_notification_policy/resource.tf
index 933e31662b..129730c80c 100644
--- a/examples/resources/cloudflare_notification_policy/resource.tf
+++ b/examples/resources/cloudflare_notification_policy/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_notification_policy" "example" {
-  account_id  = "c4a7362d577a6c3019a474fd6f485821"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "Policy for SSL notification events"
   description = "Notification policy to alert when my SSL certificates are modified"
   enabled     = true
@@ -20,7 +20,7 @@ resource "cloudflare_notification_policy" "example" {
 
 ### With Filters
 resource "cloudflare_notification_policy" "example" {
-  account_id  = "c4a7362d577a6c3019a474fd6f485821"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "Policy for Healthcheck notification"
   description = "Notification policy to alert on unhealthy Healthcheck status"
   enabled     = true
diff --git a/examples/resources/cloudflare_ruleset/resource.tf b/examples/resources/cloudflare_ruleset/resource.tf
index 2cf64372c3..e41aea3cbc 100644
--- a/examples/resources/cloudflare_ruleset/resource.tf
+++ b/examples/resources/cloudflare_ruleset/resource.tf
@@ -1,6 +1,6 @@
 # Magic Transit
 resource "cloudflare_ruleset" "magic_transit_example" {
-  account_id  = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id  = "f037e56e89293a057740de681ac9abbe"
   name        = "account magic transit"
   description = "example magic transit ruleset description"
   kind        = "root"
@@ -15,7 +15,7 @@ resource "cloudflare_ruleset" "magic_transit_example" {
 
 # Zone-level WAF Managed Ruleset
 resource "cloudflare_ruleset" "zone_level_managed_waf" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "managed WAF"
   description = "managed WAF ruleset description"
   kind        = "zone"
@@ -34,7 +34,7 @@ resource "cloudflare_ruleset" "zone_level_managed_waf" {
 
 # Zone-level WAF with tag-based overrides
 resource "cloudflare_ruleset" "zone_level_managed_waf_with_category_based_overrides" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "managed WAF with tag-based overrides"
   description = "managed WAF with tag-based overrides ruleset description"
   kind        = "zone"
@@ -67,7 +67,7 @@ resource "cloudflare_ruleset" "zone_level_managed_waf_with_category_based_overri
 
 # Rewrite the URI path component to a static path
 resource "cloudflare_ruleset" "transform_uri_rule_path" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "transform rule for URI path"
   description = "change the URI path to a new static path"
   kind        = "zone"
@@ -91,7 +91,7 @@ resource "cloudflare_ruleset" "transform_uri_rule_path" {
 
 # Rewrite the URI query component to a static query
 resource "cloudflare_ruleset" "transform_uri_rule_query" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "transform rule for URI query parameter"
   description = "change the URI query to a new static query"
   kind        = "zone"
@@ -115,7 +115,7 @@ resource "cloudflare_ruleset" "transform_uri_rule_query" {
 
 # Rewrite HTTP headers to a modified values
 resource "cloudflare_ruleset" "transform_uri_http_headers" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "transform rule for HTTP headers"
   description = "modify HTTP headers before reaching origin"
   kind        = "zone"
@@ -150,7 +150,7 @@ resource "cloudflare_ruleset" "transform_uri_http_headers" {
 
 # HTTP rate limit for an API route
 resource "cloudflare_ruleset" "rate_limiting_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "restrict API requests count"
   description = "apply HTTP rate limiting for a route"
   kind        = "zone"
@@ -176,7 +176,7 @@ resource "cloudflare_ruleset" "rate_limiting_example" {
 
 # Change origin for an API route
 resource "cloudflare_ruleset" "http_origin_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "Change to some origin"
   description = "Change origin for a route"
   kind        = "zone"
@@ -199,7 +199,7 @@ resource "cloudflare_ruleset" "http_origin_example" {
 
 # Custom fields logging
 resource "cloudflare_ruleset" "custom_fields_logging_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "log custom fields"
   description = "add custom fields to logging"
   kind        = "zone"
@@ -233,7 +233,7 @@ resource "cloudflare_ruleset" "custom_fields_logging_example" {
 
 # Custom cache keys + settings
 resource "cloudflare_ruleset" "cache_settings_example" {
-  zone_id     = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id     = "0da42c8d2132a9ddaf714f9e7c920711"
   name        = "set cache settings"
   description = "set cache settings for the request"
   kind        = "zone"
diff --git a/examples/resources/cloudflare_tunnel_route/resource.tf b/examples/resources/cloudflare_tunnel_route/resource.tf
index c1669a558c..560d74ef74 100644
--- a/examples/resources/cloudflare_tunnel_route/resource.tf
+++ b/examples/resources/cloudflare_tunnel_route/resource.tf
@@ -1,6 +1,6 @@
 # Tunnel route
 resource "cloudflare_tunnel_route" "example" {
-  account_id         = "c4a7362d577a6c3019a474fd6f485821"
+  account_id         = "f037e56e89293a057740de681ac9abbe"
   tunnel_id          = "f70ff985-a4ef-4643-bbbc-4a0ed4fc8415"
   network            = "192.0.2.24/32"
   comment            = "New tunnel route for documentation"
@@ -9,13 +9,13 @@ resource "cloudflare_tunnel_route" "example" {
 
 # Tunnel with tunnel route
 resource "cloudflare_argo_tunnel" "tunnel" {
-  account_id = "c4a7362d577a6c3019a474fd6f485821"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name       = "my_tunnel"
   secret     = "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg="
 }
 
 resource "cloudflare_tunnel_route" "example" {
-  account_id         = "c4a7362d577a6c3019a474fd6f485821"
+  account_id         = "f037e56e89293a057740de681ac9abbe"
   tunnel_id          = cloudflare_argo_tunnel.tunnel.id
   network            = "192.0.2.24/32"
   comment            = "New tunnel route for documentation"
diff --git a/examples/resources/cloudflare_tunnel_virtual_network/resource.tf b/examples/resources/cloudflare_tunnel_virtual_network/resource.tf
index 924aeda79e..ad0f35790f 100644
--- a/examples/resources/cloudflare_tunnel_virtual_network/resource.tf
+++ b/examples/resources/cloudflare_tunnel_virtual_network/resource.tf
@@ -1,5 +1,5 @@
 resource "cloudflare_tunnel_virtual_network" "example" {
-  account_id = "c4a7362d577a6c3019a474fd6f485821"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   name = "vnet-for-documentation"
   comment = "New tunnel virtual network for documentation"
 }
\ No newline at end of file
diff --git a/examples/resources/cloudflare_waiting_room/resource.tf b/examples/resources/cloudflare_waiting_room/resource.tf
index 664fd61f80..782451b7b8 100644
--- a/examples/resources/cloudflare_waiting_room/resource.tf
+++ b/examples/resources/cloudflare_waiting_room/resource.tf
@@ -1,6 +1,6 @@
 # Waiting Room
 resource "cloudflare_waiting_room" "example" {
-  zone_id              = "ae36f999674d196762efcc5abb06b345"
+  zone_id              = "0da42c8d2132a9ddaf714f9e7c920711"
   name                 = "foo"
   host                 = "foo.example.com"
   path                 = "/"
diff --git a/examples/resources/cloudflare_waiting_room_event/resource.tf b/examples/resources/cloudflare_waiting_room_event/resource.tf
index aa18b6f29b..f71fa93c7f 100644
--- a/examples/resources/cloudflare_waiting_room_event/resource.tf
+++ b/examples/resources/cloudflare_waiting_room_event/resource.tf
@@ -1,6 +1,6 @@
 # Waiting Room Event
 resource "cloudflare_waiting_room_event" "example" {
-  zone_id              = "ae36f999674d196762efcc5abb06b345"
+  zone_id              = "0da42c8d2132a9ddaf714f9e7c920711"
   waiting_room_id      = "d41d8cd98f00b204e9800998ecf8427e"
   name                 = "foo"
   event_start_time     = "2006-01-02T15:04:05Z"
diff --git a/examples/resources/cloudflare_zone/resource.tf b/examples/resources/cloudflare_zone/resource.tf
index 8c566b88e2..fd62c54734 100644
--- a/examples/resources/cloudflare_zone/resource.tf
+++ b/examples/resources/cloudflare_zone/resource.tf
@@ -1,4 +1,4 @@
 resource "cloudflare_zone" "example" {
-  account_id = "d41d8cd98f00b204e9800998ecf8427e"
+  account_id = "f037e56e89293a057740de681ac9abbe"
   zone       = "example.com"
 }
diff --git a/examples/resources/managed_headers/resource.tf b/examples/resources/managed_headers/resource.tf
index 9340aa8d12..c7a92b680c 100644
--- a/examples/resources/managed_headers/resource.tf
+++ b/examples/resources/managed_headers/resource.tf
@@ -1,6 +1,6 @@
 # Enable security headers using Managed Meaders
 resource "cloudflare_managed_headers" "add_security_headers_example" {
-  zone_id = "cb029e245cfdd66dc8d2e570d5dd3322"
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
 
   managed_request_headers {
     id      = "add_true_client_ip_headers"