diff --git a/CHANGELOG.md b/CHANGELOG.md
index 188366335fb5a..4bff068da2695 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 breaking changes in the upcoming 3.x release. This release is scheduled for
 2024-12 or 2025-01.
 
+## v2.47.1 - TBD
+
 ## v2.47.0 - 2026-02
 
 ### New Libraries
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db55e077e8a72..78fe66c7486e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,9 @@ set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues")
 
 project(
     google-cloud-cpp
-    VERSION 2.47.0
+    VERSION 2.47.1
     LANGUAGES CXX)
-set(PROJECT_VERSION_PRE_RELEASE "")
+set(PROJECT_VERSION_PRE_RELEASE "rc")
 
 if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "")
     set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}")
diff --git a/MODULE.bazel b/MODULE.bazel
index 9d839d12a55d1..f50c94ddc3eab 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -16,7 +16,7 @@
 
 module(
     name = "google_cloud_cpp",
-    version = "2.47.0",  # Updated by CMake
+    version = "2.47.1-rc",  # Updated by CMake
     compatibility_level = 2,  # Updated by CMake
 )
 
diff --git a/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz
index f7e04990f92ff..df3df037852cd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz
index 409f736e2dfd2..216d7827152ec 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz
index 8a5bbd59f5b9c..5f7ff20bde866 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz
index 7db93244bf9f0..f10f14c0c7786 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz
index e5959bb91522e..074ce0b33f00f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz
index 9af81d3d6f5fc..e2b56e8189189 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz
index ca0a66d67b30d..71f668cbee4dc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz
index f52308b497277..a411412227818 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apiregistry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apiregistry.expected.abi.dump.gz
index 2979b3345bf59..0e7268aabf9e9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apiregistry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apiregistry.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz
index e64ba92293265..405d3e1e2d818 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz
index dbd6370a8d724..03bfb0cf7c282 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz
index e63aee73f74da..3aa2d2377d6f1 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz
index 1ebeec4433c94..d2d7be29a5b72 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz
index 3f1cb18d21434..55f77791baa03 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_auditmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_auditmanager.expected.abi.dump.gz
index 983229c836c22..e97adeac61264 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_auditmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_auditmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz
index 41d8ff3b6fec9..d802a23414250 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz
index 641a1eb2e84a8..4f66b0e747558 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz
index e0f1f4e571d3b..eb1aaf4281a35 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz
index a4c419fd59715..a9bc217e86991 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz
index f4cd52c37099a..ad710811dfd77 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz
index 22962a15bf39e..689d832742d3a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz
index eeab01218aa2c..8c520f4ad5922 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz
index 309ea7989aa7a..52bd1f11f03a0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz
index e5e0498c6ec25..464a7c3da91f7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz
index 0bf08cedddf5b..03bb7650d272e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz
index fe43dd43227d4..470432f802ede 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz
index 982774c6b6566..fa4548e5fa685 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz
index abfeccceeab50..578f2bccdf1b4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz
index 6bca85e5a0b3d..c171189cb3e6c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz
index cac765d97d5af..c56b88db9412b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz
index f7c6ebc2aa2d9..1d0f5d01be770 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz
index ef380c79f748a..f7999b24b6da0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz
index 5c664a8c92937..e67e6c5dd5a92 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz
index 9db9901f96088..164c85774479b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz
index 66b9943bce342..c7c5ee425951a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz
index 37518b9cdc19d..df6d02fa8c464 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz
index 85fad37b3e9c1..c7d1403bf5400 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz
index 812e511344834..a7b7a7991d2a3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz
index 876d22e16a000..d492457b773b5 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz
index 3c53049b437a4..5a53e7a026fd7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz
index bd6b3d8052cae..6db6167009206 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz
index b41ec6ab241cc..83ae2673f071b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz
index bc81629fd15da..36c9e6907633c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz
index 7feed44c7bcd7..2fc77bc8bda7e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz
index c8a3ce6a2c271..3fc7defa93447 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz
index ee6c9f6321a6f..b408afe417ef7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz
index f5e257978cd97..1ab9397e7d17e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz
index dd5d82a0cdabd..421f240f49a65 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz
index ae12713a96835..e3a6a35557e25 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz
index 49f9d2db736df..6a86c4ae6cb89 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz
index 9a77091fd4516..eda97a5092140 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz
index 0b55a1c7f9b23..c9fc8a16819fb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz
index 84e7ee27eab79..ecbce875a2f5b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz
index cdd08043cac0b..b49ac72a59097 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz
index 8c7be1a00f4a3..cbe58950edb83 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz
index 907b76edc64b0..66e2b0c0bcc3d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz
index b275bd1e77236..5046e09403304 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz
index b53e26b3e00fd..8a3b05ab52b7d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz
index c6e6faa8e69c5..be4ba5f36430e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz
index db1c34f33daac..bf2e13b2d7953 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz
index b6ca988ea6eeb..40ad6257c7b60 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz
index 7e7c534443abf..9842aeedc5655 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz
index e506d8fd35931..0c7e500d01880 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz
index 2b3d63ef3c8ad..6c7b98bd536ed 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz
index ba0d33f3abeb4..9c77278787273 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz
index a12beff0976fa..cd6a78564e279 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz
index 5e60986d1b5a1..ac9995b345498 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz
index 10e8e96cacb22..6ff493ecb9917 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz
index 1dead1a6d3482..82202ef3ffd07 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz
index 5c4f15c24516c..944ad463bfab9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz
index 8a023937d6ead..cb8b6ed407f79 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz
index a3e3c6e9b09f7..2c380c274d55c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz
index a982b24f53dab..d1f015d1781e8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz
index b1e7816fa55d3..180432cf48c48 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz
index a442a930656ab..528707d3eb36a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz
index ae4f5cc4b7f92..c9c1448ea8fba 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz
index 5a95bdf5039a1..99be8a8a36eb7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz
index 79d0edebcc95f..1a7e1a78f081b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz
index fd063b76929de..02884727cc871 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz
index e88f5a4f7d4ce..b71bd8a5336cd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz
index bb8c5d22aac8e..2013e313433ba 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz
index 8ded0d16b1ef5..a39b58b5b2a5b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz
index fb39624c20f39..6efd65de97059 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz
index e8e2fed3636c9..d92acbfd305f7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz
index 4ba7238cf6a36..e17f3ca0f06d5 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz
index eecf702983b97..d6fe0d74f1750 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz
index 443298f8850a8..aaccfcf7e9840 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz
index 1dcd11b7609a5..28cc76fc98df0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz
index bfe91df9dcdb3..9fdb80481c499 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz
index 6bc5beefd471b..26bd0d943f7ea 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz
index 197eb96de3642..d252932908f4e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz
index 7c2f2a7f5ef1d..4159c6634c39d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz
index 79c8ea69bd989..37add2c190ce5 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz
index 1d59454268baf..02f011e565d5f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz
index aa1404fb14348..12486f93af850 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz
index ea0bfd4e8b836..f76cc53a82d73 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz
index a345af7d85330..ac448db76a1f3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz
index 6ce3a7f7d3373..a56720dac8560 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz
index 5f839fd21d252..f60734360f364 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz
index 35ca23f964923..e3267b0d8f597 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz
index bb8f286efb935..040b6ef572545 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz
index 9f851b38fb4fd..ed8e34db8b98c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz
index 49143b4588595..4954739d41416 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz
index 758c257d6f96f..8137b1a743591 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz
index 5c541b60b98fa..23a1836816ba2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz
index cd4fa71a3e688..f1fa89d8eeeba 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz
index 2d34834fb37b0..496f408a0e3f1 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz
index ab5cc6de02274..522739733dec0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz
index e64e6431f2b4c..812ff52f9eab8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz
index af8279796e35e..b3f845bde8fe4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz
index bf094246318bc..084e798265bbf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz
index e7354d34aac21..96ca14e8d6fb8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz
index 124da8edac28d..d562fd40496f1 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz
index cbc7deb1e5c53..a046275bf0bb9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz
index 62cbbb27bd73d..d455f8ba842ea 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz
index a5774eba87bc3..2ad68ca4ca82a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz
index b26704047dd15..c1571c52ea9f0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz
index ceecddcdd9d9e..6638182a365dd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz
index c410cb3ff4069..a67cb2c48ab1c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz
index 8b34b9ab7fe70..349a6483d13e6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz
index d0995f3a89aee..556d48162ff6f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz
index d1b52a03f02ed..6272a16cd0bba 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz
index bac99bba4a17c..508e847d973f5 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz
index 426460e136e7d..7360475d8b969 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz
index 069c5ccd2b9e1..8071d37177b68 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz
index 0676742e9b1c5..4581da7f24332 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz
index a83e78995e20c..b80ae77c67b5d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz
index 77071a90f7014..4d729785485a5 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz
index f2bab4c6d9e68..7d7fbc94b7826 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz
index 44df64059d8af..4cef04713829f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz
index e6289d8093a11..0b4375062e19f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz
index 7266c175aff70..a94a6cb060352 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz
index 0f5905c4fdb5a..62757d12d0be9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz
index 1a7226b1bf47e..dc956e252955d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz
index de23882d3e1f6..338b7f701db38 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz
index fe65198cb08b2..00aa3cdce2af3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz
index a6a5ac061105a..194c18ca034a7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz
index 4dc3ff787917a..3bb805210efdd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz
index 3671d48cf05b0..ae60db2483be4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz
index e193c5173b518..bd7b15df60457 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz
index 22066c293a6d2..2917cf2c5dbb6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz
index b70fca01ac56b..3255e3ea96e62 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz
index ed14fa6b91e55..4ee0ca7e8ed86 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz
index fafecf2f43fc9..e0282a9914f76 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz
index 69b20b668e993..b3e072b4e30b7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz
index c8e40d9315350..923a4367995e3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz
index add9bf06b33e7..93d9d106801f7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz
index 6b4a8e8b858b6..6cc7ac800c4c4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkerecommender.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkerecommender.expected.abi.dump.gz
index e2fd0b86d6b75..c24a9fe567422 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkerecommender.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkerecommender.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz
index 82f7e193d40cb..64dabdc813c3b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz
index 18aa35c691948..ee5afca683a5d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz
index dcfd71e3ba964..1731dedfa308a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz
index 5a91a5cc2b175..273319962bee9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz
index 00cefcdbf8f68..30f24124f0589 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz
index ab352ebcf7618..d6e89cc21dd53 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz
index 8bc3e32b13748..7c4919565105d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz
index 75ed0ab863976..7f3415f3c9041 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz
index 153f196e9b1b4..58680101ca73b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz
index cb80345d30b33..93e65cf7d124a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz
index 7c60c52047152..35225c3d2515c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz
index 6035efcb50215..c87fc2117e88c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz
index cdfb4df131c2b..e4bc80694bb35 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz
index bd40a157f7f72..5a3d900ec3eea 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz
index b9ac1464b6926..876f0cf79e4fc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz
index 2f51dbb70e45d..307036d367c19 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz
index 68d646e86a86f..6a98a31a48eba 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz
index 9b91c1559198a..f7f2342a5d8a8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz
index 7d6cb781e69cd..c4298e164bf99 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz
index e16e70768738b..bdd49fe99a3bc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz
index b87da2b180c64..27f7c7b7dac92 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz
index 98f5b92893a72..99ea5b9dfd91d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz
index 1c7fa4d9f18ed..4ce285526f5ce 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz
index f3b6a811ddfb6..3fb7fba8093bb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz
index a173ccc7cda54..dcbf80e70dc24 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz
index c3b352a92208a..ec6208ee42fc6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz
index cdcd2a359f16a..a73acd1143b69 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz
index 5ff38634be2f0..b64923ae4c5a7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz
index 48dcfd090526a..5ee8a24afe261 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz
index cfc037955679c..7abeff20a0fc0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz
index 97a8f73a7ef48..8ec5be732df1d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz
index da9f18197436b..5a61ce25a8f30 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz
index f679980c29f80..3faf474e87fbd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz
index b47c14a41f28e..8e77f57b44c74 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz
index d75891bc0514c..7358a02211b9a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz
index efe269d36774b..fcf5580d668bc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz
index b10622e58a1b0..fdc964273c2c0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz
index b94e7ccbc40ee..871e754509c20 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz
index 891d8c2a2d494..f41ecfce50fbe 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz
index 597fbc4fe3aef..114412ada273a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz
index 3c397b3b8439c..c86a0fccb4d8b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz
index 3cefde340dc6b..c244b6d2eada1 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz
index 8784065044c25..2753670c0b5ee 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz
index afc6ab0bcde75..c619b00954cc6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz
index f167f0b26a63f..36ce18589b0f8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz
index 3d0a5ab3ad5d6..7abfdc9fed7e0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz
index 8a29b97af553d..db834cfee8a72 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz
index d33b0f6c021ed..9bc1e20562f74 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz
index f55d3247c09f4..42764215a384b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz
index 75f7fe2a28590..870b9d828364b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz
index 1e95a9780cd04..51d738e8412c8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz
index d065f57e2922b..31efb3fc9d7b4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz
index b1cddb1639bc8..2a6b9a2df2fe0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz
index 8f305575b1b8f..e8cb2bf7207c4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz
index 6c1da7347cbc6..95e575a4a0462 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz
index 662cde0c13e82..5803765f0f848 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz
index 8e5828c4bc87f..0cdb25fec054c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz
index 1179b574dd2a4..975b1afdd0a2f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz
index b46bd10e16253..eb823801ab70e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz
index 792244b420b17..ed1d04de78149 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz
index 679ba0623bcad..646b0b4f5b5ea 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz
index e07471f59062a..ab5db12b23868 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz
index 27ee141b4772b..94e678abcc85f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz
index 34f7d69a852de..3f903c182715e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz
index 1855d530c064a..2e17142766d97 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz
index 2ecd7c0204857..737b7eb62ee02 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz
index 7766b9799f50c..94f3e8b91f934 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz
index 82ac173692915..c5eae2032bf15 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz
index c5a36a083f682..0a070c4793cac 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz
index 94c5e94a049bf..6278efe230d79 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz
index e12a32fdb1f12..d3fa81646bd58 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz
index 81ff415707a70..43e431ad82345 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz
index d4d8a382f2e0b..4d641921351fc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz
index 5845e43bc85d2..469674cabf8b7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz
index 3367a6bd6b509..8ff32384095ae 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz
index ae98cfc11b24c..2500dcbaf3d71 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz
index 7f28f2da53b25..9329d81628956 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz
index a6521da7a7ad4..10446f564cfe9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz
index 477e9f5ed1c62..cb3e4bc955803 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz
index e705ea8c30646..5fb7f2452fb6d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz
index 6ea06836b74b5..75fcdfde5b405 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz
index 0b03c53d01ab9..0ee327b64e4eb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz
index 3308b06c5644b..d064bbbfd0350 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz
index fcf814b9ad75f..55c914540d89c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz
index b676d1d7034cd..414f761520e22 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz
index 4bb0a0574d041..1f428f525d166 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz differ
diff --git a/ci/cloudbuild/triggers/asan-ci.yaml b/ci/cloudbuild/triggers/asan-ci.yaml
index 4e624d3aebc7a..15c66ddd8c649 100644
--- a/ci/cloudbuild/triggers/asan-ci.yaml
+++ b/ci/cloudbuild/triggers/asan-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-22T00:38:08.167137222Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: a803727d-8633-49ea-b545-bd7f9124bc3d
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: asan-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a803727d-8633-49ea-b545-bd7f9124bc3d
+name: v2-47-x-asan-ci
 substitutions:
   _BUILD_NAME: asan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/asan-pr.yaml b/ci/cloudbuild/triggers/asan-pr.yaml
index e1b22dbb1abe4..0e62a205172f4 100644
--- a/ci/cloudbuild/triggers/asan-pr.yaml
+++ b/ci/cloudbuild/triggers/asan-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:26.533760362Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 45fd50c2-04f1-4674-b533-0db1346c8b7e
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: asan-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/45fd50c2-04f1-4674-b533-0db1346c8b7e
+name: v2-47-x-asan-pr
 substitutions:
   _BUILD_NAME: asan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/bazel-oldest-ci.yaml b/ci/cloudbuild/triggers/bazel-oldest-ci.yaml
index 31df3bb45423f..135eb07ee7f41 100644
--- a/ci/cloudbuild/triggers/bazel-oldest-ci.yaml
+++ b/ci/cloudbuild/triggers/bazel-oldest-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-02-08T12:44:34.878690706Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 3a7690ee-a385-4e86-835e-990a64eb71d7
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-oldest-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3a7690ee-a385-4e86-835e-990a64eb71d7
+name: v2-47-x-bazel-oldest-ci
 substitutions:
   _BUILD_NAME: bazel-oldest
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/bazel-oldest-pr.yaml b/ci/cloudbuild/triggers/bazel-oldest-pr.yaml
index 4f4b2b36421ed..979ea51099c47 100644
--- a/ci/cloudbuild/triggers/bazel-oldest-pr.yaml
+++ b/ci/cloudbuild/triggers/bazel-oldest-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-02-08T12:44:28.719440875Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 914bc7a4-afa2-4faf-8a0e-571218e8fd83
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-oldest-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/914bc7a4-afa2-4faf-8a0e-571218e8fd83
+name: v2-47-x-bazel-oldest-pr
 substitutions:
   _BUILD_NAME: bazel-oldest
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml b/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml
index af9768ad913c3..652700d4e7470 100644
--- a/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml
+++ b/ci/cloudbuild/triggers/bazel-otel-abi-2-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-12-13T16:53:04.793743056Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: abfbaa6f-e1a0-4298-af45-78f9dc1a9831
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-otel-abi-2-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/abfbaa6f-e1a0-4298-af45-78f9dc1a9831
+name: v2-47-x-bazel-otel-abi-2-ci
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml b/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml
index 338f750994701..0424e4e7f5b87 100644
--- a/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml
+++ b/ci/cloudbuild/triggers/bazel-otel-abi-2-pr.yaml
@@ -17,12 +17,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 18b11d89-0625-40ba-897a-ac10462d1c7b
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-otel-abi-2-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/18b11d89-0625-40ba-897a-ac10462d1c7b
+name: v2-47-x-bazel-otel-abi-2-pr
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/bazel-targets-ci.yaml b/ci/cloudbuild/triggers/bazel-targets-ci.yaml
index 599e2586bb30d..4fcf8fa51581f 100644
--- a/ci/cloudbuild/triggers/bazel-targets-ci.yaml
+++ b/ci/cloudbuild/triggers/bazel-targets-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-26T16:37:27.818296611Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 1f63c286-589b-41cf-aee0-dd0e3cb6861c
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-targets-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/1f63c286-589b-41cf-aee0-dd0e3cb6861c
+name: v2-47-x-bazel-targets-ci
 substitutions:
   _BUILD_NAME: bazel-targets
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/bazel-targets-pr.yaml b/ci/cloudbuild/triggers/bazel-targets-pr.yaml
index a50efe76ffb8e..09f11070f40fb 100644
--- a/ci/cloudbuild/triggers/bazel-targets-pr.yaml
+++ b/ci/cloudbuild/triggers/bazel-targets-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-26T16:37:32.709851004Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 95e11a96-2138-4d65-8598-25308f1cf5f8
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-targets-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/95e11a96-2138-4d65-8598-25308f1cf5f8
+name: v2-47-x-bazel-targets-pr
 substitutions:
   _BUILD_NAME: bazel-targets
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/check-api-ci.yaml b/ci/cloudbuild/triggers/check-api-ci.yaml
index 1c0314e181c66..e3dece08cf0b7 100644
--- a/ci/cloudbuild/triggers/check-api-ci.yaml
+++ b/ci/cloudbuild/triggers/check-api-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-30T13:51:14.389552861Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 83b375fa-9209-4691-8dcc-a28f7a19dcf2
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: check-api-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/83b375fa-9209-4691-8dcc-a28f7a19dcf2
+name: v2-47-x-check-api-ci
 substitutions:
   _BUILD_NAME: check-api
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/check-api-pr.yaml b/ci/cloudbuild/triggers/check-api-pr.yaml
index e4a68a40daa43..9ca74934a6b18 100644
--- a/ci/cloudbuild/triggers/check-api-pr.yaml
+++ b/ci/cloudbuild/triggers/check-api-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-30T13:51:18.047210322Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 9d4afe6c-48fc-4bc4-8b40-68312b2c0fec
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: check-api-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/9d4afe6c-48fc-4bc4-8b40-68312b2c0fec
+name: v2-47-x-check-api-pr
 substitutions:
   _BUILD_NAME: check-api
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/checkers-ci.yaml b/ci/cloudbuild/triggers/checkers-ci.yaml
index ad3403e81f633..bef04d4afb547 100644
--- a/ci/cloudbuild/triggers/checkers-ci.yaml
+++ b/ci/cloudbuild/triggers/checkers-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-30T00:38:59.589682412Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 2d35a7fd-e273-44d4-b592-fc8810327a27
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: checkers-ci
+name: v2-47-x-checkers-ci
 substitutions:
   _BUILD_NAME: checkers
   _DISTRO: checkers
diff --git a/ci/cloudbuild/triggers/checkers-pr.yaml b/ci/cloudbuild/triggers/checkers-pr.yaml
index 8e1c2a766ee8b..4c27b3d0a6803 100644
--- a/ci/cloudbuild/triggers/checkers-pr.yaml
+++ b/ci/cloudbuild/triggers/checkers-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:32.194276806Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 746bbc75-cdf8-4172-bb08-0c2335479a8b
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: checkers-pr
+name: v2-47-x-checkers-pr
 substitutions:
   _BUILD_NAME: checkers
   _DISTRO: checkers
diff --git a/ci/cloudbuild/triggers/clang-7-0-ci.yaml b/ci/cloudbuild/triggers/clang-7-0-ci.yaml
index f9e881ba2c41d..1133b104c7074 100644
--- a/ci/cloudbuild/triggers/clang-7-0-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-7-0-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-06-02T17:19:48.154215116Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: c9060166-f159-46c6-8ac9-4f256759fcb8
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-7-0-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/c9060166-f159-46c6-8ac9-4f256759fcb8
+name: v2-47-x-clang-7-0-ci
 substitutions:
   _BUILD_NAME: clang-7.0
   _DISTRO: ubuntu-20.04-install
diff --git a/ci/cloudbuild/triggers/clang-7-0-pr.yaml b/ci/cloudbuild/triggers/clang-7-0-pr.yaml
index 57e61a54dfde2..44290c68f626f 100644
--- a/ci/cloudbuild/triggers/clang-7-0-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-7-0-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-06-02T17:19:52.984755094Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 8a4c069a-53c0-49bf-ba31-5f3a3c228a42
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-7-0-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8a4c069a-53c0-49bf-ba31-5f3a3c228a42
+name: v2-47-x-clang-7-0-pr
 substitutions:
   _BUILD_NAME: clang-7.0
   _DISTRO: ubuntu-20.04-install
diff --git a/ci/cloudbuild/triggers/clang-cxx20-ci.yaml b/ci/cloudbuild/triggers/clang-cxx20-ci.yaml
index f576175518750..4f98ff163ad72 100644
--- a/ci/cloudbuild/triggers/clang-cxx20-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-cxx20-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2024-02-20T18:40:45.776612692Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: ed6fae7b-7ab3-44b9-b26b-d41de3926e16
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-cxx20-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ed6fae7b-7ab3-44b9-b26b-d41de3926e16
+name: v2-47-x-clang-cxx20-ci
 substitutions:
   _BUILD_NAME: clang-cxx20
   _DISTRO: fedora-latest-cxx20
diff --git a/ci/cloudbuild/triggers/clang-cxx20-pr.yaml b/ci/cloudbuild/triggers/clang-cxx20-pr.yaml
index d91fe98fa40da..4bfbc805bce9f 100644
--- a/ci/cloudbuild/triggers/clang-cxx20-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-cxx20-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2024-02-20T18:41:20.365076403Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: b5fb032a-c06d-4369-b42d-98524085d402
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-cxx20-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/b5fb032a-c06d-4369-b42d-98524085d402
+name: v2-47-x-clang-cxx20-pr
 substitutions:
   _BUILD_NAME: clang-cxx20
   _DISTRO: fedora-latest-cxx20
diff --git a/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml
index b954e747a024d..1116a48b409e0 100644
--- a/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-bigquery-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:38:53.406054685Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 5ad8f0dd-38a8-4a40-aa81-925e0867fef6
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-bigquery-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5ad8f0dd-38a8-4a40-aa81-925e0867fef6
+name: v2-47-x-clang-tidy-bigquery-ci
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml
index 3172cac412840..19bfc20152331 100644
--- a/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-bigquery-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:38:54.756444054Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 94fbc973-ea4b-49e9-a1ce-db3994993675
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-bigquery-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/94fbc973-ea4b-49e9-a1ce-db3994993675
+name: v2-47-x-clang-tidy-bigquery-pr
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-ci.yaml
index fc71b6c8eb0dd..35f507967092c 100644
--- a/ci/cloudbuild/triggers/clang-tidy-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-22T00:36:44.386437504Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 88b3547a-7d8b-4af2-998f-e2ed284ebaaa
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/88b3547a-7d8b-4af2-998f-e2ed284ebaaa
+name: v2-47-x-clang-tidy-ci
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-compute.yaml b/ci/cloudbuild/triggers/clang-tidy-compute.yaml
index 3478a8c656eb3..a2cd5eacdb7fd 100644
--- a/ci/cloudbuild/triggers/clang-tidy-compute.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-compute.yaml
@@ -12,18 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-07-10T20:41:19.444876272Z'
 description: Runs clang-tidy on all compute libraries.
 gitFileSource:
   path: ci/cloudbuild/cloudbuild.yaml
   repoType: GITHUB
-  revision: refs/heads/main
   uri: https://github.com/googleapis/google-cloud-cpp
-id: 6d247368-98d8-4b06-9179-afeedd054f50
-name: clang-tidy-compute
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6d247368-98d8-4b06-9179-afeedd054f50
+name: v2-47-x-clang-tidy-compute
 sourceToBuild:
-  ref: refs/heads/main
   repoType: GITHUB
   uri: https://github.com/googleapis/google-cloud-cpp
 substitutions:
diff --git a/ci/cloudbuild/triggers/clang-tidy-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-pr.yaml
index 3df8445b2199f..aacc7d7bf7abd 100644
--- a/ci/cloudbuild/triggers/clang-tidy-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:36.012514343Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 8448ca7a-edac-4d56-ae23-928897249570
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8448ca7a-edac-4d56-ae23-928897249570
+name: v2-47-x-clang-tidy-pr
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml
index 46ec3f0f85b19..606bb889ad341 100644
--- a/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-pubsub-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:38:56.263489135Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 7bdca032-6ec4-4b7c-9c0b-d04bd19c2ba3
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-pubsub-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7bdca032-6ec4-4b7c-9c0b-d04bd19c2ba3
+name: v2-47-x-clang-tidy-pubsub-ci
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml
index 2aa254d3eceb8..ebc0d52f02bae 100644
--- a/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-pubsub-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:38:57.870335767Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 47691835-f91f-42a3-92bf-7820c2eb34f2
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-pubsub-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/47691835-f91f-42a3-92bf-7820c2eb34f2
+name: v2-47-x-clang-tidy-pubsub-pr
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml
index aa39e6a6335df..9cce92a0d53b8 100644
--- a/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-storage-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:38:59.377179872Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: dcb2a46a-01f9-4b02-8c34-79943099e25f
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-storage-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/dcb2a46a-01f9-4b02-8c34-79943099e25f
+name: v2-47-x-clang-tidy-storage-ci
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml
index 25a3b368e72b3..a5a74d23dce7f 100644
--- a/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-storage-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:39:00.640655067Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 163b45f9-e55c-48fb-948d-c1f4539f1524
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-storage-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/163b45f9-e55c-48fb-948d-c1f4539f1524
+name: v2-47-x-clang-tidy-storage-pr
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml b/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml
index f1945eeb1a984..907da097ba294 100644
--- a/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-tools-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:39:02.117138961Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 8be80238-a508-43c4-a1c3-8ce285cbb571
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-tools-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/8be80238-a508-43c4-a1c3-8ce285cbb571
+name: v2-47-x-clang-tidy-tools-ci
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml b/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml
index b220c26c2034b..3375ad19e30f6 100644
--- a/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml
+++ b/ci/cloudbuild/triggers/clang-tidy-tools-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-24T17:39:03.693462256Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: cb911c90-e6a6-4440-a1c9-0890cce4565f
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: clang-tidy-tools-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/cb911c90-e6a6-4440-a1c9-0890cce4565f
+name: v2-47-x-clang-tidy-tools-pr
 substitutions:
   _BUILD_NAME: clang-tidy
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml b/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml
index 91b7cd684fc96..17183fa9ea499 100644
--- a/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml
+++ b/ci/cloudbuild/triggers/cmake-gcs-rest-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-04-28T21:23:21.953441802Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 87c8300c-afd2-419e-b878-2e8ceb7a7496
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-gcs-rest-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/87c8300c-afd2-419e-b878-2e8ceb7a7496
+name: v2-47-x-cmake-gcs-rest-ci
 substitutions:
   _BUILD_NAME: cmake-gcs-rest
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml b/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml
index f33f31f74bcda..206e6a5ab1dab 100644
--- a/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml
+++ b/ci/cloudbuild/triggers/cmake-gcs-rest-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-04-28T21:23:32.712697493Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 4bc5ac63-ff83-4063-b5f6-c1d04c0ce706
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-gcs-rest-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/4bc5ac63-ff83-4063-b5f6-c1d04c0ce706
+name: v2-47-x-cmake-gcs-rest-pr
 substitutions:
   _BUILD_NAME: cmake-gcs-rest
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-install-ci.yaml b/ci/cloudbuild/triggers/cmake-install-ci.yaml
index 1e9ea8a9d495d..e598ea661b7ae 100644
--- a/ci/cloudbuild/triggers/cmake-install-ci.yaml
+++ b/ci/cloudbuild/triggers/cmake-install-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-24T00:02:59.444857698Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 49d3dff1-bee0-4a2b-9bd1-a696d54e48c9
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-install-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/49d3dff1-bee0-4a2b-9bd1-a696d54e48c9
+name: v2-47-x-cmake-install-ci
 substitutions:
   _BUILD_NAME: cmake-install
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-install-pr.yaml b/ci/cloudbuild/triggers/cmake-install-pr.yaml
index 46529333844cd..b93311312e224 100644
--- a/ci/cloudbuild/triggers/cmake-install-pr.yaml
+++ b/ci/cloudbuild/triggers/cmake-install-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:41.397491676Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 1e40a006-1073-4d1b-82ca-03528fd3fd51
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-install-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/1e40a006-1073-4d1b-82ca-03528fd3fd51
+name: v2-47-x-cmake-install-pr
 substitutions:
   _BUILD_NAME: cmake-install
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml b/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml
index a4e015aa1d0c3..3b2e922b2dcd6 100644
--- a/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml
+++ b/ci/cloudbuild/triggers/cmake-oldest-deps-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-28T12:39:57.322470341Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 64e55546-2701-4234-b348-fe9a4478dd38
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-oldest-deps-ci
+name: v2-47-x-cmake-oldest-deps-ci
 substitutions:
   _BUILD_NAME: cmake-oldest-deps
   _DISTRO: ubuntu-focal
diff --git a/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml b/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml
index f91205e69e765..7a90cb9712d0a 100644
--- a/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml
+++ b/ci/cloudbuild/triggers/cmake-oldest-deps-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-28T12:39:51.473360103Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 384786a7-5ee5-49e2-8866-369fe55c7d04
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-oldest-deps-pr
+name: v2-47-x-cmake-oldest-deps-pr
 substitutions:
   _BUILD_NAME: cmake-oldest-deps
   _DISTRO: ubuntu-focal
diff --git a/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml b/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml
index 5576c038e3231..b0825f7838b5a 100644
--- a/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml
+++ b/ci/cloudbuild/triggers/cmake-single-feature-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-05-06T21:50:55.921332969Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 09d4a76e-0a9f-4ef1-ab7e-de78684c23cc
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-single-feature-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/09d4a76e-0a9f-4ef1-ab7e-de78684c23cc
+name: v2-47-x-cmake-single-feature-ci
 substitutions:
   _BUILD_NAME: cmake-single-feature
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml b/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml
index b51df7d6d4c6b..74310fbbc914f 100644
--- a/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml
+++ b/ci/cloudbuild/triggers/cmake-single-feature-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-05-06T21:51:02.240926631Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 3e376bfc-ab89-4c29-a640-f7f88f756c8c
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-single-feature-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3e376bfc-ab89-4c29-a640-f7f88f756c8c
+name: v2-47-x-cmake-single-feature-pr
 substitutions:
   _BUILD_NAME: cmake-single-feature
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-split-install-ci.yaml b/ci/cloudbuild/triggers/cmake-split-install-ci.yaml
index d76869eee2028..079e2015e9c75 100644
--- a/ci/cloudbuild/triggers/cmake-split-install-ci.yaml
+++ b/ci/cloudbuild/triggers/cmake-split-install-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-07-10T15:26:52.770667141Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 0b727502-82fe-41a1-a4e2-73f9375718ad
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-split-install-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/0b727502-82fe-41a1-a4e2-73f9375718ad
+name: v2-47-x-cmake-split-install-ci
 substitutions:
   _BUILD_NAME: cmake-split-install
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/cmake-split-install-pr.yaml b/ci/cloudbuild/triggers/cmake-split-install-pr.yaml
index 0d0a9193291e6..253c523a5ad24 100644
--- a/ci/cloudbuild/triggers/cmake-split-install-pr.yaml
+++ b/ci/cloudbuild/triggers/cmake-split-install-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-07-10T15:26:59.182700120Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: a6f49616-83ce-4471-b517-f86c44e09ce5
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cmake-split-install-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a6f49616-83ce-4471-b517-f86c44e09ce5
+name: v2-47-x-cmake-split-install-pr
 substitutions:
   _BUILD_NAME: cmake-split-install
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/conformance-ci.yaml b/ci/cloudbuild/triggers/conformance-ci.yaml
index c02548500f06f..b1b609c1a880e 100644
--- a/ci/cloudbuild/triggers/conformance-ci.yaml
+++ b/ci/cloudbuild/triggers/conformance-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-30T21:38:59.771402989Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 9858e9c0-2f5a-45ad-9e5b-3af30eaf30af
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: conformance-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/9858e9c0-2f5a-45ad-9e5b-3af30eaf30af
+name: v2-47-x-conformance-ci
 substitutions:
   _BUILD_NAME: conformance
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/conformance-pr.yaml b/ci/cloudbuild/triggers/conformance-pr.yaml
index 90c09130c8612..f75efc40db388 100644
--- a/ci/cloudbuild/triggers/conformance-pr.yaml
+++ b/ci/cloudbuild/triggers/conformance-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-10-30T21:35:19.557214462Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 03976e73-5154-457f-813f-4d33bb162e70
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: conformance-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/03976e73-5154-457f-813f-4d33bb162e70
+name: v2-47-x-conformance-pr
 substitutions:
   _BUILD_NAME: conformance
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/coverage-ci.yaml b/ci/cloudbuild/triggers/coverage-ci.yaml
index af06ffa89b86c..5b3ce90d55629 100644
--- a/ci/cloudbuild/triggers/coverage-ci.yaml
+++ b/ci/cloudbuild/triggers/coverage-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-16T13:00:27.617873387Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 5c4f383c-11bc-4eb7-a42f-c8d69172caf2
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: coverage-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5c4f383c-11bc-4eb7-a42f-c8d69172caf2
+name: v2-47-x-coverage-ci
 substitutions:
   _BUILD_NAME: coverage
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/coverage-pr.yaml b/ci/cloudbuild/triggers/coverage-pr.yaml
index a6f08ff1dde82..b988142a658e7 100644
--- a/ci/cloudbuild/triggers/coverage-pr.yaml
+++ b/ci/cloudbuild/triggers/coverage-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-16T13:00:31.944469840Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 0ada9a21-5379-48e2-9e6d-8c388d6333e5
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: coverage-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/0ada9a21-5379-48e2-9e6d-8c388d6333e5
+name: v2-47-x-coverage-pr
 substitutions:
   _BUILD_NAME: coverage
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/cxx14-ci.yaml b/ci/cloudbuild/triggers/cxx14-ci.yaml
index 1d828f4ffd743..59656007be3f8 100644
--- a/ci/cloudbuild/triggers/cxx14-ci.yaml
+++ b/ci/cloudbuild/triggers/cxx14-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-06-23T15:35:45.803275576Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 23c2a0e2-d64f-4ca4-869a-1064e2549624
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cxx14-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/23c2a0e2-d64f-4ca4-869a-1064e2549624
+name: v2-47-x-cxx14-ci
 substitutions:
   _BUILD_NAME: cxx14
   _DISTRO: fedora-latest-cxx14
diff --git a/ci/cloudbuild/triggers/cxx14-pr.yaml b/ci/cloudbuild/triggers/cxx14-pr.yaml
index 872298572d48b..0f2323bada382 100644
--- a/ci/cloudbuild/triggers/cxx14-pr.yaml
+++ b/ci/cloudbuild/triggers/cxx14-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-06-23T15:35:40.201715614Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 54861c36-30b4-4c71-81f9-a765a957ef23
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cxx14-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/54861c36-30b4-4c71-81f9-a765a957ef23
+name: v2-47-x-cxx14-pr
 substitutions:
   _BUILD_NAME: cxx14
   _DISTRO: fedora-latest-cxx14
diff --git a/ci/cloudbuild/triggers/cxx20-ci.yaml b/ci/cloudbuild/triggers/cxx20-ci.yaml
index c91ce65b5d020..8d9f338805a4a 100644
--- a/ci/cloudbuild/triggers/cxx20-ci.yaml
+++ b/ci/cloudbuild/triggers/cxx20-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-10-21T13:06:18.672990290Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 7471e4f8-769d-48dd-8f6f-253bef7051ef
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cxx20-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7471e4f8-769d-48dd-8f6f-253bef7051ef
+name: v2-47-x-cxx20-ci
 substitutions:
   _BUILD_NAME: cxx20
   _DISTRO: fedora-latest-cxx20
diff --git a/ci/cloudbuild/triggers/cxx20-pr.yaml b/ci/cloudbuild/triggers/cxx20-pr.yaml
index 648d65635062b..34e0b59436e79 100644
--- a/ci/cloudbuild/triggers/cxx20-pr.yaml
+++ b/ci/cloudbuild/triggers/cxx20-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-10-21T13:06:28.013633506Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: f4da53f5-3966-45bd-8821-8a43a0804ecc
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: cxx20-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f4da53f5-3966-45bd-8821-8a43a0804ecc
+name: v2-47-x-cxx20-pr
 substitutions:
   _BUILD_NAME: cxx20
   _DISTRO: fedora-latest-cxx20
diff --git a/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml b/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml
index 505824c5934b8..c26f95cb803a2 100644
--- a/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-alpine-stable-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-06-24T18:22:48.436591174Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: d5596043-576e-41b2-b324-72805c5983e1
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-alpine-stable-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/d5596043-576e-41b2-b324-72805c5983e1
+name: v2-47-x-demo-alpine-stable-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-alpine-stable
diff --git a/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml b/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml
index 7e7ae83ac78dd..0e5b8694478e7 100644
--- a/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-alpine-stable-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-06-24T18:22:53.925960095Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 85f2a500-3643-4ac3-96be-4b824a69762f
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-alpine-stable-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/85f2a500-3643-4ac3-96be-4b824a69762f
+name: v2-47-x-demo-alpine-stable-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-alpine-stable
diff --git a/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml b/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml
index ea8d0346b10aa..b208108768f52 100644
--- a/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-debian-bookworm-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-09-09T16:23:55.750964253Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 6e1b6108-8b51-4751-ba8c-59dd82c062dc
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-debian-bookworm-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6e1b6108-8b51-4751-ba8c-59dd82c062dc
+name: v2-47-x-demo-debian-bookworm-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-debian-bookworm
diff --git a/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml b/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml
index 8ededcc7d56a8..64cb39c3177f9 100644
--- a/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-debian-bookworm-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-09-09T16:24:10.043640665Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: f1cbc3fc-d09b-483f-bb4c-0ea3394b334e
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-debian-bookworm-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f1cbc3fc-d09b-483f-bb4c-0ea3394b334e
+name: v2-47-x-demo-debian-bookworm-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-debian-bookworm
diff --git a/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml b/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml
index 32bc2d971ee0a..386fa335fad15 100644
--- a/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-debian-bullseye-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-08-17T14:42:37.946358416Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 99ed51ab-3b42-4046-8698-6ea54b39afaa
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-debian-bullseye-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/99ed51ab-3b42-4046-8698-6ea54b39afaa
+name: v2-47-x-demo-debian-bullseye-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-debian-bullseye
diff --git a/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml b/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml
index a18f67684c95b..0eff34e0a9f65 100644
--- a/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-debian-bullseye-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-08-17T14:43:32.603712645Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 3cc016a1-2a35-467a-94af-4eab3822cbfd
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-debian-bullseye-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3cc016a1-2a35-467a-94af-4eab3822cbfd
+name: v2-47-x-demo-debian-bullseye-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-debian-bullseye
diff --git a/ci/cloudbuild/triggers/demo-fedora-ci.yaml b/ci/cloudbuild/triggers/demo-fedora-ci.yaml
index a8d5d0048ed6d..dd6e8257ce4d4 100644
--- a/ci/cloudbuild/triggers/demo-fedora-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-fedora-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-13T23:35:58.117686333Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: efe44360-59b3-4784-96f6-ebe03ecdd2f7
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-fedora-ci
+name: v2-47-x-demo-fedora-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-fedora
diff --git a/ci/cloudbuild/triggers/demo-fedora-pr.yaml b/ci/cloudbuild/triggers/demo-fedora-pr.yaml
index f622b52d16894..f7c6095c98e4f 100644
--- a/ci/cloudbuild/triggers/demo-fedora-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-fedora-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-13T23:35:59.268915688Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 182e01a3-0956-47bc-9a8a-023318168962
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-fedora-pr
+name: v2-47-x-demo-fedora-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-fedora
diff --git a/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml b/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml
index ae9bcd864c143..75ea7897efd5f 100644
--- a/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-opensuse-leap-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-13T23:36:00.260269718Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 3b91bcd6-80af-4aa0-9e64-60047f5a65f5
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-opensuse-leap-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3b91bcd6-80af-4aa0-9e64-60047f5a65f5
+name: v2-47-x-demo-opensuse-leap-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-opensuse-leap
diff --git a/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml b/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml
index 8f9130fc2a1b4..dabbd578dbe50 100644
--- a/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-opensuse-leap-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-13T23:36:01.288217115Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: f18095de-383b-45bd-835e-06a70adbf296
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-opensuse-leap-pr
+name: v2-47-x-demo-opensuse-leap-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-opensuse-leap
diff --git a/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml b/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml
index 688a3c84594c9..39b21145111d3 100644
--- a/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-rockylinux-9-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-11-09T20:49:08.012480312Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: de5ea0bf-fef1-433d-aa17-4cb50ab8278b
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-rockylinux-9-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/de5ea0bf-fef1-433d-aa17-4cb50ab8278b
+name: v2-47-x-demo-rockylinux-9-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-rockylinux-9
diff --git a/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml b/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml
index 80128088e5b7e..a3768c3e3ed52 100644
--- a/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-rockylinux-9-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-11-09T20:49:14.519880680Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 55c2722f-ba23-4b27-af94-cee7095098e2
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-rockylinux-9-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/55c2722f-ba23-4b27-af94-cee7095098e2
+name: v2-47-x-demo-rockylinux-9-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-rockylinux-9
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml
index 76f3eba809deb..1bf3497698b2d 100644
--- a/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-ubuntu-24-04-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2024-04-29T15:41:19.785339726Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 93fdf9e2-71b2-44a1-911e-13dca09cbd7c
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-ubuntu-24-04-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/93fdf9e2-71b2-44a1-911e-13dca09cbd7c
+name: v2-47-x-demo-ubuntu-24-04-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-ubuntu-24.04
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml
index a3cc011fc7e9e..c0c41789f1da5 100644
--- a/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-ubuntu-24-04-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2024-04-29T15:40:53.593998357Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 4e65bb4a-0deb-4e5c-a074-f628fa012f13
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-ubuntu-24-04-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/4e65bb4a-0deb-4e5c-a074-f628fa012f13
+name: v2-47-x-demo-ubuntu-24-04-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-ubuntu-24.04
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml
index 9c435a293efba..b486abedf1010 100644
--- a/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-ubuntu-focal-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-13T23:36:04.667175923Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 0294a1e2-044b-45d5-8ba0-6806c93b3a72
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-ubuntu-focal-ci
+name: v2-47-x-demo-ubuntu-focal-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-ubuntu-focal
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml
index 639e4e8ac38c5..6d6e99e77f875 100644
--- a/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-ubuntu-focal-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-13T23:36:05.750350763Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 22188f98-620b-4a43-b5f7-34f206d70062
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-ubuntu-focal-pr
+name: v2-47-x-demo-ubuntu-focal-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-ubuntu-focal
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml b/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml
index 750bbb568dc53..5b2c3eb46a28c 100644
--- a/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml
+++ b/ci/cloudbuild/triggers/demo-ubuntu-jammy-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-05-13T19:36:13.788953133Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: a646ace3-c0a6-4acf-8e42-72c8d2aece0c
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-ubuntu-jammy-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/a646ace3-c0a6-4acf-8e42-72c8d2aece0c
+name: v2-47-x-demo-ubuntu-jammy-ci
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-ubuntu-jammy
diff --git a/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml b/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml
index 866f7a55a244a..94230b1189b52 100644
--- a/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml
+++ b/ci/cloudbuild/triggers/demo-ubuntu-jammy-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-05-13T19:36:14.958592625Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: f190d45e-015f-4e09-bc3f-864aebf18316
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: demo-ubuntu-jammy-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f190d45e-015f-4e09-bc3f-864aebf18316
+name: v2-47-x-demo-ubuntu-jammy-pr
 substitutions:
   _BUILD_NAME: demo-install
   _DISTRO: demo-ubuntu-jammy
diff --git a/ci/cloudbuild/triggers/gcc-oldest-ci.yaml b/ci/cloudbuild/triggers/gcc-oldest-ci.yaml
index 4a3f90949fe28..08da81fb75575 100644
--- a/ci/cloudbuild/triggers/gcc-oldest-ci.yaml
+++ b/ci/cloudbuild/triggers/gcc-oldest-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2024-07-02T17:49:31.595592561Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 71fc938d-2480-4bdb-b274-eb0bf3a3ed1b
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: gcc-oldest-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/71fc938d-2480-4bdb-b274-eb0bf3a3ed1b
+name: v2-47-x-gcc-oldest-ci
 substitutions:
   _BUILD_NAME: gcc-oldest
   _DISTRO: gcc-oldest
diff --git a/ci/cloudbuild/triggers/gcc-oldest-pr.yaml b/ci/cloudbuild/triggers/gcc-oldest-pr.yaml
index 5f2ddeb348c6f..7b14590e3266c 100644
--- a/ci/cloudbuild/triggers/gcc-oldest-pr.yaml
+++ b/ci/cloudbuild/triggers/gcc-oldest-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2024-07-02T17:51:28.002279385Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: d2015e6f-b0c4-46a4-afc6-d1ac99c4abea
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: gcc-oldest-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/d2015e6f-b0c4-46a4-afc6-d1ac99c4abea
+name: v2-47-x-gcc-oldest-pr
 substitutions:
   _BUILD_NAME: gcc-oldest
   _DISTRO: gcc-oldest
diff --git a/ci/cloudbuild/triggers/generate-libraries-ci.yaml b/ci/cloudbuild/triggers/generate-libraries-ci.yaml
index 032b0fe9af591..4e5b33e8f768e 100644
--- a/ci/cloudbuild/triggers/generate-libraries-ci.yaml
+++ b/ci/cloudbuild/triggers/generate-libraries-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-23T21:24:08.230967530Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 11fcbd32-d016-4661-ba98-31c65277739c
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: generate-libraries-ci
+name: v2-47-x-generate-libraries-ci
 substitutions:
   _BUILD_NAME: generate-libraries
   _DISTRO: checkers
diff --git a/ci/cloudbuild/triggers/generate-libraries-pr.yaml b/ci/cloudbuild/triggers/generate-libraries-pr.yaml
index 0fd7ad36c90c4..2e56909eb6cd2 100644
--- a/ci/cloudbuild/triggers/generate-libraries-pr.yaml
+++ b/ci/cloudbuild/triggers/generate-libraries-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-23T21:24:15.931797724Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 6dc01f3c-7ccc-422f-8adb-2de0478853b3
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: generate-libraries-pr
+name: v2-47-x-generate-libraries-pr
 substitutions:
   _BUILD_NAME: generate-libraries
   _DISTRO: checkers
diff --git a/ci/cloudbuild/triggers/grpc-at-head.yaml b/ci/cloudbuild/triggers/grpc-at-head.yaml
deleted file mode 100644
index 6a7540265f2e4..0000000000000
--- a/ci/cloudbuild/triggers/grpc-at-head.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-createTime: '2023-03-27T18:47:54.336916197Z'
-description: Compiles using gRPC at HEAD
-gitFileSource:
-  path: ci/cloudbuild/cloudbuild.yaml
-  repoType: GITHUB
-  revision: refs/heads/main
-  uri: https://github.com/googleapis/google-cloud-cpp
-id: e21f4d09-213f-41ef-9be5-62309adf4287
-name: grpc-at-head
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/e21f4d09-213f-41ef-9be5-62309adf4287
-sourceToBuild:
-  ref: refs/heads/main
-  repoType: GITHUB
-  uri: https://github.com/googleapis/google-cloud-cpp
-substitutions:
-  _BUILD_NAME: grpc-at-head
-  _DISTRO: fedora-latest-bazel
-  _TAG1: friends
-  _TRIGGER_TYPE: daily
-tags:
-- integration
-- daily
-- nightly
-- manual
-- fedora
-- friends
diff --git a/ci/cloudbuild/triggers/integration-daily.yaml b/ci/cloudbuild/triggers/integration-daily.yaml
index 6bb4b4101b872..410b6e65de814 100644
--- a/ci/cloudbuild/triggers/integration-daily.yaml
+++ b/ci/cloudbuild/triggers/integration-daily.yaml
@@ -12,18 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-26T23:11:01.303393604Z'
 description: Runs the slow integration tests
 gitFileSource:
   path: ci/cloudbuild/cloudbuild.yaml
   repoType: GITHUB
-  revision: refs/heads/main
   uri: https://github.com/googleapis/google-cloud-cpp
-id: 03b9bb52-8d28-4095-9ca4-653f8602acf7
-name: integration-daily
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/03b9bb52-8d28-4095-9ca4-653f8602acf7
+name: v2-47-x-integration-daily
 sourceToBuild:
-  ref: refs/heads/main
   repoType: GITHUB
   uri: https://github.com/googleapis/google-cloud-cpp
 substitutions:
diff --git a/ci/cloudbuild/triggers/integration-production-ci.yaml b/ci/cloudbuild/triggers/integration-production-ci.yaml
index 7c22f06458c91..35c5115055862 100644
--- a/ci/cloudbuild/triggers/integration-production-ci.yaml
+++ b/ci/cloudbuild/triggers/integration-production-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-02-10T22:16:26.551396759Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: ee3bb11b-6d26-4c21-a5fb-aeca37c2deb8
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: integration-production-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ee3bb11b-6d26-4c21-a5fb-aeca37c2deb8
+name: v2-47-x-integration-production-ci
 substitutions:
   _BUILD_NAME: integration-production
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/integration-production-pr.yaml b/ci/cloudbuild/triggers/integration-production-pr.yaml
index 3ffd9c67bae97..5efc5da7d055d 100644
--- a/ci/cloudbuild/triggers/integration-production-pr.yaml
+++ b/ci/cloudbuild/triggers/integration-production-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-02-10T22:16:19.911913669Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 60e90544-5856-457c-b293-d9bade69c132
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: integration-production-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/60e90544-5856-457c-b293-d9bade69c132
+name: v2-47-x-integration-production-pr
 substitutions:
   _BUILD_NAME: integration-production
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/libcxx-ci.yaml b/ci/cloudbuild/triggers/libcxx-ci.yaml
index 0fc1a57d02c30..538eec09cbad9 100644
--- a/ci/cloudbuild/triggers/libcxx-ci.yaml
+++ b/ci/cloudbuild/triggers/libcxx-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-14T19:46:44.349528722Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 431b657a-77ea-4448-8f1f-16af521409e5
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: libcxx-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/431b657a-77ea-4448-8f1f-16af521409e5
+name: v2-47-x-libcxx-ci
 substitutions:
   _BUILD_NAME: libcxx
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/libcxx-pr.yaml b/ci/cloudbuild/triggers/libcxx-pr.yaml
index 12c49e687492c..d67a991533e6b 100644
--- a/ci/cloudbuild/triggers/libcxx-pr.yaml
+++ b/ci/cloudbuild/triggers/libcxx-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-14T19:46:45.308277299Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: bb2d6a6f-9cf9-493a-bcbc-b7c0b60514a6
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: libcxx-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/bb2d6a6f-9cf9-493a-bcbc-b7c0b60514a6
+name: v2-47-x-libcxx-pr
 substitutions:
   _BUILD_NAME: libcxx
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/m32-ci.yaml b/ci/cloudbuild/triggers/m32-ci.yaml
index 98c6f632d9945..4ed33f685f06e 100644
--- a/ci/cloudbuild/triggers/m32-ci.yaml
+++ b/ci/cloudbuild/triggers/m32-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-02-08T12:05:48.696628316Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: b3c7d288-1474-4114-9a12-4d07d25a541e
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: m32-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/b3c7d288-1474-4114-9a12-4d07d25a541e
+name: v2-47-x-m32-ci
 substitutions:
   _BUILD_NAME: m32
   _DISTRO: fedora-m32
diff --git a/ci/cloudbuild/triggers/m32-pr.yaml b/ci/cloudbuild/triggers/m32-pr.yaml
index b608731b732bb..84b346726c3ff 100644
--- a/ci/cloudbuild/triggers/m32-pr.yaml
+++ b/ci/cloudbuild/triggers/m32-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-02-08T12:05:52.742100534Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 5eaadd40-1942-4c3f-b3ac-b4feae945a54
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: m32-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/5eaadd40-1942-4c3f-b3ac-b4feae945a54
+name: v2-47-x-m32-pr
 substitutions:
   _BUILD_NAME: m32
   _DISTRO: fedora-m32
diff --git a/ci/cloudbuild/triggers/msan-ci.yaml b/ci/cloudbuild/triggers/msan-ci.yaml
index 30164fa9eba24..bd568edecb96a 100644
--- a/ci/cloudbuild/triggers/msan-ci.yaml
+++ b/ci/cloudbuild/triggers/msan-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-15T01:54:43.175858386Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 6a79664d-8602-4312-9c33-810683d8f847
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: msan-ci
+name: v2-47-x-msan-ci
 substitutions:
   _BUILD_NAME: msan
   _DISTRO: fedora-msan
diff --git a/ci/cloudbuild/triggers/msan-pr.yaml b/ci/cloudbuild/triggers/msan-pr.yaml
index cf775a9ab4704..956a085f7b9ac 100644
--- a/ci/cloudbuild/triggers/msan-pr.yaml
+++ b/ci/cloudbuild/triggers/msan-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-15T01:54:38.313691225Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: d9988eca-23ae-4b44-ad1f-ae38b12d5987
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: msan-pr
+name: v2-47-x-msan-pr
 substitutions:
   _BUILD_NAME: msan
   _DISTRO: fedora-msan
diff --git a/ci/cloudbuild/triggers/noex-ci.yaml b/ci/cloudbuild/triggers/noex-ci.yaml
index fb5c1adb8185d..679079743f945 100644
--- a/ci/cloudbuild/triggers/noex-ci.yaml
+++ b/ci/cloudbuild/triggers/noex-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-14T14:41:37.760841534Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: ab963829-28af-4d7c-8aa4-e2598f8b8862
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: noex-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ab963829-28af-4d7c-8aa4-e2598f8b8862
+name: v2-47-x-noex-ci
 substitutions:
   _BUILD_NAME: noex
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/noex-pr.yaml b/ci/cloudbuild/triggers/noex-pr.yaml
index 0870e554ca8aa..91144ae84a9e8 100644
--- a/ci/cloudbuild/triggers/noex-pr.yaml
+++ b/ci/cloudbuild/triggers/noex-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-14T14:41:33.605980616Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: da93fa8a-46af-4274-b397-ac1cc33c46c5
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: noex-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/da93fa8a-46af-4274-b397-ac1cc33c46c5
+name: v2-47-x-noex-pr
 substitutions:
   _BUILD_NAME: noex
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml b/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml
index 81d34aa9b4c73..8fbf64ace8e93 100644
--- a/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml
+++ b/ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-11-29T04:06:34.344761147Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 95ef05ac-0f7d-46b6-ae3c-bf9e3b1bd342
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: otel-disabled-bazel-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/95ef05ac-0f7d-46b6-ae3c-bf9e3b1bd342
+name: v2-47-x-otel-disabled-bazel-ci
 substitutions:
   _BUILD_NAME: otel-disabled-bazel
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml b/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml
index c23e51ca34edf..f5eb6ca8ae0cc 100644
--- a/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml
+++ b/ci/cloudbuild/triggers/otel-disabled-bazel-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-11-29T04:06:20.679878755Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: e645a8df-6b2c-4911-a192-e36e6d8935b6
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: otel-disabled-bazel-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/e645a8df-6b2c-4911-a192-e36e6d8935b6
+name: v2-47-x-otel-disabled-bazel-pr
 substitutions:
   _BUILD_NAME: otel-disabled-bazel
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/protobuf-at-head.yaml b/ci/cloudbuild/triggers/protobuf-at-head.yaml
deleted file mode 100644
index c2f1d9a6d247d..0000000000000
--- a/ci/cloudbuild/triggers/protobuf-at-head.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-createTime: '2023-06-13T12:46:50.379194817Z'
-description: Compiles using gRPC at HEAD
-gitFileSource:
-  path: ci/cloudbuild/cloudbuild.yaml
-  repoType: GITHUB
-  revision: refs/heads/main
-  uri: https://github.com/googleapis/google-cloud-cpp
-id: 7dc9cea4-9d0b-4d0f-9947-5b79bfee5c12
-name: protobuf-at-head
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7dc9cea4-9d0b-4d0f-9947-5b79bfee5c12
-sourceToBuild:
-  ref: refs/heads/main
-  repoType: GITHUB
-  uri: https://github.com/googleapis/google-cloud-cpp
-substitutions:
-  _BUILD_NAME: protobuf-at-head
-  _DISTRO: fedora-latest-bazel
-  _TAG1: friends
-  _TRIGGER_TYPE: daily
-tags:
-- integration
-- daily
-- nightly
-- manual
-- fedora
-- friends
diff --git a/ci/cloudbuild/triggers/publish-docs-ci.yaml b/ci/cloudbuild/triggers/publish-docs-ci.yaml
index 06c8d2a99eff9..e0dc68d693e64 100644
--- a/ci/cloudbuild/triggers/publish-docs-ci.yaml
+++ b/ci/cloudbuild/triggers/publish-docs-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-23T19:47:54.365241453Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: ee436bb0-22ab-407d-ab69-2a73aec2566d
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: publish-docs-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ee436bb0-22ab-407d-ab69-2a73aec2566d
+name: v2-47-x-publish-docs-ci
 substitutions:
   _BUILD_NAME: publish-docs
   _DISTRO: fedora-latest-publish-docs
diff --git a/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml b/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml
index 4f1ddfb1d58cb..a1b4fb46f0f61 100644
--- a/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml
+++ b/ci/cloudbuild/triggers/publish-docs-compute-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2023-08-28T23:51:12.027081210Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 30ee0e3e-4eed-4b33-8786-47baae4947c1
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: publish-docs-compute-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/30ee0e3e-4eed-4b33-8786-47baae4947c1
+name: v2-47-x-publish-docs-compute-pr
 substitutions:
   _BUILD_NAME: publish-docs
   _DISTRO: fedora-latest-publish-docs
diff --git a/ci/cloudbuild/triggers/publish-docs-pr.yaml b/ci/cloudbuild/triggers/publish-docs-pr.yaml
index 91234eb86db42..143930cde0f29 100644
--- a/ci/cloudbuild/triggers/publish-docs-pr.yaml
+++ b/ci/cloudbuild/triggers/publish-docs-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-23T21:24:42.026459567Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 7957a267-70de-4e1b-a6b9-99469602a8af
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: publish-docs-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7957a267-70de-4e1b-a6b9-99469602a8af
+name: v2-47-x-publish-docs-pr
 substitutions:
   _BUILD_NAME: publish-docs
   _DISTRO: fedora-latest-publish-docs
diff --git a/ci/cloudbuild/triggers/publish-docs-release.yaml b/ci/cloudbuild/triggers/publish-docs-release.yaml
index f2f64840f1708..ee76e2f303a1c 100644
--- a/ci/cloudbuild/triggers/publish-docs-release.yaml
+++ b/ci/cloudbuild/triggers/publish-docs-release.yaml
@@ -12,16 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-11-02T14:12:26.217489944Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^v2.*.x$
-id: d8deccfb-08d6-4ab7-b8fe-1d59c2d346ea
-name: publish-docs-release
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/d8deccfb-08d6-4ab7-b8fe-1d59c2d346ea
+    branch: v2.47.x
+name: v2-47-x-publish-docs-release
 substitutions:
   _BUILD_NAME: publish-docs
   _DISTRO: fedora-latest-publish-docs
diff --git a/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml b/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml
index 7f76a05047241..f720aaac97ae0 100644
--- a/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml
+++ b/ci/cloudbuild/triggers/quickstart-bazel-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-29T23:07:34.524944837Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 1967685b-bdf1-48e2-abe5-593db92382ef
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: quickstart-bazel-ci
+name: v2-47-x-quickstart-bazel-ci
 substitutions:
   _BUILD_NAME: quickstart-bazel
   _DISTRO: ubuntu-24.04
diff --git a/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml b/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml
index 35e3d24f2b615..8b404cf7445f5 100644
--- a/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml
+++ b/ci/cloudbuild/triggers/quickstart-bazel-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:48.096780282Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 77afa7e6-cfd6-46c4-9b38-a943a61335ca
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: quickstart-bazel-pr
+name: v2-47-x-quickstart-bazel-pr
 substitutions:
   _BUILD_NAME: quickstart-bazel
   _DISTRO: ubuntu-24.04
diff --git a/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml b/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml
index 76d7afc27e182..7ec82981d78bf 100644
--- a/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml
+++ b/ci/cloudbuild/triggers/quickstart-cmake-ci.yaml
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-29T23:07:43.402748254Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: ff22d673-dc4c-4330-922e-d43be27ef2b4
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: quickstart-cmake-ci
+name: v2-47-x-quickstart-cmake-ci
 substitutions:
   _BUILD_NAME: quickstart-cmake
   _DISTRO: ubuntu-focal
diff --git a/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml b/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml
index 66d23059e1546..63821cf2bc7d0 100644
--- a/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml
+++ b/ci/cloudbuild/triggers/quickstart-cmake-pr.yaml
@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:49.856898769Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 94aaedf9-cbc3-4b7b-b571-a6281587d358
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: quickstart-cmake-pr
+name: v2-47-x-quickstart-cmake-pr
 substitutions:
   _BUILD_NAME: quickstart-cmake
   _DISTRO: ubuntu-focal
diff --git a/ci/cloudbuild/triggers/quickstart-production-ci.yaml b/ci/cloudbuild/triggers/quickstart-production-ci.yaml
index d65a6f0ea9fa6..5985ded809626 100644
--- a/ci/cloudbuild/triggers/quickstart-production-ci.yaml
+++ b/ci/cloudbuild/triggers/quickstart-production-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-02-11T02:48:03.262626422Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: f516d42a-ed88-432f-9ee7-5e4ac4d5c676
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: quickstart-production-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f516d42a-ed88-432f-9ee7-5e4ac4d5c676
+name: v2-47-x-quickstart-production-ci
 substitutions:
   _BUILD_NAME: quickstart-production
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/quickstart-production-pr.yaml b/ci/cloudbuild/triggers/quickstart-production-pr.yaml
index 61c5159c0fd5d..9befb84f9ad4a 100644
--- a/ci/cloudbuild/triggers/quickstart-production-pr.yaml
+++ b/ci/cloudbuild/triggers/quickstart-production-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2022-02-11T02:48:08.775499777Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: e373a802-f341-4559-bb55-7ec64f1ee825
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: quickstart-production-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/e373a802-f341-4559-bb55-7ec64f1ee825
+name: v2-47-x-quickstart-production-pr
 substitutions:
   _BUILD_NAME: quickstart-production
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/rotate-keys.yaml b/ci/cloudbuild/triggers/rotate-keys.yaml
deleted file mode 100644
index 6fe036a1ab2ba..0000000000000
--- a/ci/cloudbuild/triggers/rotate-keys.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-createTime: '2021-04-23T00:24:28.311789386Z'
-description: Rotates the SA keys used by the GCS integration test
-gitFileSource:
-  path: ci/cloudbuild/cloudbuild.yaml
-  repoType: GITHUB
-  revision: refs/heads/main
-  uri: https://github.com/googleapis/google-cloud-cpp
-id: 3fca51de-ec4c-453f-9693-5ccec556a379
-name: rotate-keys
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3fca51de-ec4c-453f-9693-5ccec556a379
-sourceToBuild:
-  ref: refs/heads/main
-  repoType: GITHUB
-  uri: https://github.com/googleapis/google-cloud-cpp
-substitutions:
-  _BUILD_NAME: rotate-keys
-  _DISTRO: fedora-latest-bazel
-  _LOGS_BUCKET: cloud-cpp-testing-resources_cloudbuild
-  _TRIGGER_TYPE: daily
-tags:
-- rotate-keys
-- gcs
-- manual
-- fedora
-- daily
diff --git a/ci/cloudbuild/triggers/shared-ci.yaml b/ci/cloudbuild/triggers/shared-ci.yaml
index 008946395d067..974c2458f1bd9 100644
--- a/ci/cloudbuild/triggers/shared-ci.yaml
+++ b/ci/cloudbuild/triggers/shared-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-16T17:54:50.114636655Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 876841fe-996a-4b64-a080-62b05313b8ff
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: shared-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/876841fe-996a-4b64-a080-62b05313b8ff
+name: v2-47-x-shared-ci
 substitutions:
   _BUILD_NAME: shared
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/shared-pr.yaml b/ci/cloudbuild/triggers/shared-pr.yaml
index 403320d3b4727..f6524de585699 100644
--- a/ci/cloudbuild/triggers/shared-pr.yaml
+++ b/ci/cloudbuild/triggers/shared-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-16T17:54:51.132738909Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 0a6fec60-47ba-4795-979b-4aec54e16d1a
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: shared-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/0a6fec60-47ba-4795-979b-4aec54e16d1a
+name: v2-47-x-shared-pr
 substitutions:
   _BUILD_NAME: shared
   _DISTRO: fedora-latest-cmake
diff --git a/ci/cloudbuild/triggers/tsan-ci.yaml b/ci/cloudbuild/triggers/tsan-ci.yaml
index a58bf045dc09f..02195496b0825 100644
--- a/ci/cloudbuild/triggers/tsan-ci.yaml
+++ b/ci/cloudbuild/triggers/tsan-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-30T01:00:00.841245060Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: de7c77d3-385d-48b6-a6e8-9dda0c171716
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: tsan-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/de7c77d3-385d-48b6-a6e8-9dda0c171716
+name: v2-47-x-tsan-ci
 substitutions:
   _BUILD_NAME: tsan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/tsan-pr.yaml b/ci/cloudbuild/triggers/tsan-pr.yaml
index 41f3d6d016aa5..0dfb2c5379a14 100644
--- a/ci/cloudbuild/triggers/tsan-pr.yaml
+++ b/ci/cloudbuild/triggers/tsan-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:51.542576617Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: ea400a9b-879a-4e13-a4b3-9109825d6e99
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: tsan-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/ea400a9b-879a-4e13-a4b3-9109825d6e99
+name: v2-47-x-tsan-pr
 substitutions:
   _BUILD_NAME: tsan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/ubsan-ci.yaml b/ci/cloudbuild/triggers/ubsan-ci.yaml
index 7cbb2d8d1eeab..a543b8f818216 100644
--- a/ci/cloudbuild/triggers/ubsan-ci.yaml
+++ b/ci/cloudbuild/triggers/ubsan-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-28T18:40:21.563522491Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: f61a17f2-316f-4ba5-a56a-5abd55e3da83
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: ubsan-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/f61a17f2-316f-4ba5-a56a-5abd55e3da83
+name: v2-47-x-ubsan-ci
 substitutions:
   _BUILD_NAME: ubsan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/ubsan-pr.yaml b/ci/cloudbuild/triggers/ubsan-pr.yaml
index 61d4e03aa8f6b..c3fb962e61d01 100644
--- a/ci/cloudbuild/triggers/ubsan-pr.yaml
+++ b/ci/cloudbuild/triggers/ubsan-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:53.351255451Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 6e77e431-c822-40c7-a8de-7860b4b0fc69
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: ubsan-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/6e77e431-c822-40c7-a8de-7860b4b0fc69
+name: v2-47-x-ubsan-pr
 substitutions:
   _BUILD_NAME: ubsan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/universe-domain-ci.yaml b/ci/cloudbuild/triggers/universe-domain-ci.yaml
index 860a7bee6332d..f06b6ae78a43d 100644
--- a/ci/cloudbuild/triggers/universe-domain-ci.yaml
+++ b/ci/cloudbuild/triggers/universe-domain-ci.yaml
@@ -17,8 +17,8 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-name: universe-domain-ci
+    branch: v2.47.x
+name: v2-47-x-universe-domain-ci
 substitutions:
   _BUILD_NAME: universe-domain
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/universe-domain-pr.yaml b/ci/cloudbuild/triggers/universe-domain-pr.yaml
index 61b0926549a7d..51443d4c84cd1 100644
--- a/ci/cloudbuild/triggers/universe-domain-pr.yaml
+++ b/ci/cloudbuild/triggers/universe-domain-pr.yaml
@@ -17,9 +17,9 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-name: universe-domain-pr
+name: v2-47-x-universe-domain-pr
 substitutions:
   _BUILD_NAME: universe-domain
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/xsan-ci.yaml b/ci/cloudbuild/triggers/xsan-ci.yaml
index 17489a5295092..7f426934c36e4 100644
--- a/ci/cloudbuild/triggers/xsan-ci.yaml
+++ b/ci/cloudbuild/triggers/xsan-ci.yaml
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-03-23T16:27:32.983843488Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
-id: 7af338de-c46d-41ff-a96b-f58e3b720fc5
+    branch: v2.47.x
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: xsan-ci
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/7af338de-c46d-41ff-a96b-f58e3b720fc5
+name: v2-47-x-xsan-ci
 substitutions:
   _BUILD_NAME: xsan
   _DISTRO: fedora-latest-bazel
diff --git a/ci/cloudbuild/triggers/xsan-pr.yaml b/ci/cloudbuild/triggers/xsan-pr.yaml
index 6cd9595b22baa..44c863ac35bc3 100644
--- a/ci/cloudbuild/triggers/xsan-pr.yaml
+++ b/ci/cloudbuild/triggers/xsan-pr.yaml
@@ -12,18 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-createTime: '2021-04-09T18:15:54.945301389Z'
 filename: ci/cloudbuild/cloudbuild.yaml
 github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.47.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
-id: 679ab848-3bcc-4e46-b4e5-4cd86d4b1405
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: xsan-pr
-resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/679ab848-3bcc-4e46-b4e5-4cd86d4b1405
+name: v2-47-x-xsan-pr
 substitutions:
   _BUILD_NAME: xsan
   _DISTRO: fedora-latest-bazel
diff --git a/google/cloud/internal/version_info.h b/google/cloud/internal/version_info.h
index 480ac76fe17e6..ddf779650dc20 100644
--- a/google/cloud/internal/version_info.h
+++ b/google/cloud/internal/version_info.h
@@ -20,7 +20,7 @@
 // NOLINTNEXTLINE(modernize-macro-to-enum)
 #define GOOGLE_CLOUD_CPP_VERSION_MINOR 47
 // NOLINTNEXTLINE(modernize-macro-to-enum)
-#define GOOGLE_CLOUD_CPP_VERSION_PATCH 0
-#define GOOGLE_CLOUD_CPP_VERSION_PRE_RELEASE ""
+#define GOOGLE_CLOUD_CPP_VERSION_PATCH 1
+#define GOOGLE_CLOUD_CPP_VERSION_PRE_RELEASE "rc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_VERSION_INFO_H