diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
index 2ac52ca77eb35..55cbd0e577365 100644
--- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
@@ -113,36 +113,28 @@ steps:
         runtimeFlavor: ${{ parameters.runtimeFlavor }}
         runtimeVariant: ${{ parameters.runtimeVariant }}
 
-        ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+          # Access token variable for internal project from the
+          # DotNet-HelixApi-Access variable group
+          helixAccessToken: $(HelixApiAccessToken)
+        ${{ else }}:
           creator: $(Build.DefinitionName)
 
-          helixBuild: $(Build.BuildNumber)
-          helixSource: $(_HelixSource)
+        helixBuild: $(Build.BuildNumber)
+        helixSource: $(_HelixSource)
+        ${{ if ne(parameters.readyToRun, true) }}:
+          helixType: 'test/functional/cli/'
 
-          ${{ if ne(parameters.readyToRun, true) }}:
-            helixType: 'test/functional/cli/'
-
-          helixQueues: ${{ parameters.helixQueues }}
-
-          # This tests whether an array is empty
-          ${{ if eq(join('', parameters.helixQueues), '') }}:
-            condition: false
-
-          publishTestResults: true
-
-          timeoutPerTestInMinutes: $(timeoutPerTestInMinutes)
-          timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)
-
-          runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
-          compositeBuildMode: ${{ parameters.compositeBuildMode }}
-          runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
-          nativeAotTest: ${{ parameters.nativeAotTest }}
-
-          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-            # Access token variable for internal project from the
-            # DotNet-HelixApi-Access variable group
-            helixAccessToken: $(HelixApiAccessToken)
-
-          helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj'
-
-          scenarios: ${{ parameters.scenarios }}
+        helixQueues: ${{ parameters.helixQueues }}
+        # This tests whether an array is empty
+        ${{ if eq(join('', parameters.helixQueues), '') }}:
+          condition: false
+        publishTestResults: true
+        timeoutPerTestInMinutes: $(timeoutPerTestInMinutes)
+        timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)
+        runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
+        compositeBuildMode: ${{ parameters.compositeBuildMode }}
+        runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
+        nativeAotTest: ${{ parameters.nativeAotTest }}
+        helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj'
+        scenarios: ${{ parameters.scenarios }}