diff --git a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/IntegrationTestingPipelineConvention.cs b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/IntegrationTestingPipelineConvention.cs
index 0a5d8e78ba9..9cc208ea197 100644
--- a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/IntegrationTestingPipelineConvention.cs
+++ b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/IntegrationTestingPipelineConvention.cs
@@ -25,7 +25,7 @@ protected override async Task<bool> ApplyConventionAsync(BuildDefinition definit
         {
             var hasChanges = await base.ApplyConventionAsync(definition, component);
 
-            if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true))
+            if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true, securePipeline: true))
             {
                 hasChanges = true;
             }
diff --git a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PipelineConvention.cs b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PipelineConvention.cs
index 59c096c0339..b83203e8a61 100644
--- a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PipelineConvention.cs
+++ b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PipelineConvention.cs
@@ -313,7 +313,7 @@ protected virtual Task<bool> ApplyConventionAsync(BuildDefinition definition, Sd
             return Task.FromResult(hasChanges);
         }
 
-        protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool overrideYaml = true)
+        protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool overrideYaml = true, bool securePipeline = true)
         {
             bool hasChanges = false;
             var prTriggers = definition.Triggers.OfType<PullRequestTrigger>();
@@ -333,11 +333,12 @@ protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool o
 
                 newTrigger.Forks = new Forks
                 {
-                    AllowSecrets = true,
+                    AllowSecrets = securePipeline,
                     Enabled = true
                 };
+
                 newTrigger.RequireCommentsForNonTeamMembersOnly = false;
-                newTrigger.IsCommentRequiredForPullRequest = true;
+                newTrigger.IsCommentRequiredForPullRequest = securePipeline;
 
                 definition.Triggers.Add(newTrigger);
                 hasChanges = true;
@@ -366,16 +367,16 @@ protected bool EnsureDefautPullRequestTrigger(BuildDefinition definition, bool o
                         }
 
                     }
-                    if (trigger.RequireCommentsForNonTeamMembersOnly ||
-                       !trigger.Forks.AllowSecrets ||
-                       !trigger.Forks.Enabled ||
-                       !trigger.IsCommentRequiredForPullRequest
+                    if (trigger.RequireCommentsForNonTeamMembersOnly != false ||
+                       trigger.Forks.AllowSecrets != securePipeline ||
+                       trigger.Forks.Enabled != true ||
+                       trigger.IsCommentRequiredForPullRequest != securePipeline
                        )
                     {
-                        trigger.Forks.AllowSecrets = true;
+                        trigger.Forks.AllowSecrets = securePipeline;
                         trigger.Forks.Enabled = true;
                         trigger.RequireCommentsForNonTeamMembersOnly = false;
-                        trigger.IsCommentRequiredForPullRequest = true;
+                        trigger.IsCommentRequiredForPullRequest = securePipeline;
    
                         hasChanges = true;
                     }
diff --git a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PullRequestValidationPipelineConvention.cs b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PullRequestValidationPipelineConvention.cs
index 3738fb31b32..d4f66468e91 100644
--- a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PullRequestValidationPipelineConvention.cs
+++ b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/PullRequestValidationPipelineConvention.cs
@@ -25,7 +25,7 @@ protected override async Task<bool> ApplyConventionAsync(BuildDefinition definit
         {
             var hasChanges = await base.ApplyConventionAsync(definition, component);
 
-            if (EnsureDefautPullRequestTrigger(definition, overrideYaml: false))
+            if (EnsureDefautPullRequestTrigger(definition, overrideYaml: false, securePipeline: false))
             {
                 hasChanges = true;
             }
diff --git a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/UnifiedPipelineConvention.cs b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/UnifiedPipelineConvention.cs
index ec0692cb661..2e9c51787a2 100644
--- a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/UnifiedPipelineConvention.cs
+++ b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Conventions/UnifiedPipelineConvention.cs
@@ -25,7 +25,7 @@ protected override async Task<bool> ApplyConventionAsync(BuildDefinition definit
         {
             var hasChanges = await base.ApplyConventionAsync(definition, component);
 
-            if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true))
+            if (EnsureDefautPullRequestTrigger(definition, overrideYaml: true, securePipeline: true))
             {
                 hasChanges = true;
             }