diff --git a/.changelog/8062.txt b/.changelog/8062.txt
new file mode 100644
index 00000000000..8ec013c0699
--- /dev/null
+++ b/.changelog/8062.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/resource_cloudbuild_bitbucket_server_config_generated_test.go b/google/resource_cloudbuild_bitbucket_server_config_generated_test.go
index bb13d1717ff..0b6503c4b2c 100644
--- a/google/resource_cloudbuild_bitbucket_server_config_generated_test.go
+++ b/google/resource_cloudbuild_bitbucket_server_config_generated_test.go
@@ -58,7 +58,7 @@ func TestAccCloudBuildBitbucketServerConfig_cloudbuildBitbucketServerConfigExamp
 func testAccCloudBuildBitbucketServerConfig_cloudbuildBitbucketServerConfigExample(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_cloudbuild_bitbucket_server_config" "bbs-config" {
-    config_id = "mybbsconfig"
+    config_id = "tf-test-bbs-config%{random_suffix}"
     location = "us-central1"
     host_uri = "https://bbs.com"
     secrets {
@@ -128,7 +128,7 @@ resource "google_service_networking_connection" "default" {
 }
 
 resource "google_cloudbuild_bitbucket_server_config" "bbs-config-with-peered-network" {
-    config_id = "mybbsconfig"
+    config_id = "tf-test-bbs-config%{random_suffix}"
     location = "us-central1"
     host_uri = "https://bbs.com"
     secrets {
diff --git a/website/docs/r/cloudbuild_bitbucket_server_config.html.markdown b/website/docs/r/cloudbuild_bitbucket_server_config.html.markdown
index 1f567e5f68c..4f201b959e5 100644
--- a/website/docs/r/cloudbuild_bitbucket_server_config.html.markdown
+++ b/website/docs/r/cloudbuild_bitbucket_server_config.html.markdown
@@ -38,7 +38,7 @@ To get more information about BitbucketServerConfig, see:
 
 ```hcl
 resource "google_cloudbuild_bitbucket_server_config" "bbs-config" {
-    config_id = "mybbsconfig"
+    config_id = "bbs-config"
     location = "us-central1"
     host_uri = "https://bbs.com"
     secrets {
@@ -55,7 +55,7 @@ resource "google_cloudbuild_bitbucket_server_config" "bbs-config" {
 
 ```hcl
 resource "google_cloudbuild_bitbucket_server_config" "bbs-config-with-repos" {
-    config_id = "mybbsconfig"
+    config_id = "bbs-config"
     location = "us-central1"
     host_uri = "https://bbs.com"
     secrets {
@@ -113,7 +113,7 @@ resource "google_service_networking_connection" "default" {
 }
 
 resource "google_cloudbuild_bitbucket_server_config" "bbs-config-with-peered-network" {
-    config_id = "mybbsconfig"
+    config_id = "bbs-config"
     location = "us-central1"
     host_uri = "https://bbs.com"
     secrets {