diff --git a/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt b/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt
index f34904d69718..705e20671b6a 100644
--- a/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt
+++ b/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt
@@ -24,7 +24,8 @@ object HashicorpVCSRootGa_featureBranchMajorRelease600: GitVcsRoot({
     url = "https://github.com/hashicorp/terraform-provider-${ProviderNameGa}"
     branch = "refs/heads/${branchName}"
     branchSpec = """
-        +:FEATURE-BRANCH-major-release-6*
+        +:(refs/heads/*)
+        -:refs/pulls/*
     """.trimIndent()
 })
 
@@ -33,7 +34,8 @@ object HashicorpVCSRootBeta_featureBranchMajorRelease600: GitVcsRoot({
     url = "https://github.com/hashicorp/terraform-provider-${ProviderNameBeta}"
     branch = "refs/heads/${branchName}"
     branchSpec = """
-        +:FEATURE-BRANCH-major-release-6*
+        +:(refs/heads/*)
+        -:refs/pulls/*
     """.trimIndent()
 })
 
@@ -68,7 +70,7 @@ fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Proje
                         HashicorpVCSRootGa_featureBranchMajorRelease600,
                         gaConfig,
                         NightlyTriggerConfiguration(
-                            branch = branchName, // Make triggered builds use the feature branch
+                            branch = "refs/heads/${branchName}", // Make triggered builds use the feature branch
                             daysOfWeek = "5"     // Thursday for GA, TeamCity numbers days Sun=1...Sat=7
                         ), 
                     )
@@ -88,7 +90,7 @@ fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Proje
                         HashicorpVCSRootBeta_featureBranchMajorRelease600,
                         betaConfig,
                         NightlyTriggerConfiguration(
-                            branch = branchName, // Make triggered builds use the feature branch
+                            branch = "refs/heads/${branchName}", // Make triggered builds use the feature branch
                             daysOfWeek="6"       // Friday for Beta, TeamCity numbers days Sun=1...Sat=7
                         ),
                     )