diff --git a/build/baselines-database-scenarios.yml b/build/baselines-database-scenarios.yml
index 456c998e0..53468ef62 100644
--- a/build/baselines-database-scenarios.yml
+++ b/build/baselines-database-scenarios.yml
@@ -72,7 +72,6 @@ steps:
     - task: PublishToAzureServiceBus@1
       condition: succeededOrFailed()
       timeoutInMinutes: 10
-      retryCountOnTaskFailure: 1
       displayName: "${{ s.displayName }} - ${{ b.displayName }}"
       inputs:
         connectedServiceName: ${{ parameters.connection }}
@@ -82,5 +81,6 @@ steps:
           {
             "name": "crank",
             "condition": "(${{ parameters.condition }})",
+            "retries": 1,
             "args": [ "${{ s.arguments }} ${{ b.arguments }} ${{ parameters.arguments }} $(azureProfile) --variable duration=30 --no-metadata --no-measurements --session $(session) --command-line-property --table BaselineBenchmarks --sql SQL_CONNECTION_STRING --chart" ]
           }
diff --git a/build/baselines-scenarios.yml b/build/baselines-scenarios.yml
index 7dd5926a5..76ea8b5f1 100644
--- a/build/baselines-scenarios.yml
+++ b/build/baselines-scenarios.yml
@@ -69,7 +69,6 @@ steps:
     - task: PublishToAzureServiceBus@1
       condition: succeededOrFailed()
       timeoutInMinutes: 10
-      retryCountOnTaskFailure: 1
       displayName: "${{ s.displayName }} - ${{ b.displayName }}"
       inputs:
         connectedServiceName: ${{ parameters.connection }}
@@ -79,5 +78,6 @@ steps:
           {
             "name": "crank",
             "condition": "(${{ parameters.condition }})",
+            "retries": 1,
             "args": [ "${{ s.arguments }} ${{ b.arguments }} ${{ parameters.arguments }} $(azureProfile) --no-metadata --no-measurements --session $(session) --command-line-property --table BaselineBenchmarks --sql SQL_CONNECTION_STRING  --chart" ]
           }
diff --git a/build/frameworks-database-scenarios.yml b/build/frameworks-database-scenarios.yml
index 324a5408d..8f5cab91f 100644
--- a/build/frameworks-database-scenarios.yml
+++ b/build/frameworks-database-scenarios.yml
@@ -50,7 +50,6 @@ steps:
   - task: PublishToAzureServiceBus@1
     condition: succeededOrFailed()
     displayName: ${{ s.displayName }}
-    retryCountOnTaskFailure: 1
     inputs:
       connectedServiceName: ${{ parameters.connection }}
       waitForCompletion: true
@@ -59,5 +58,6 @@ steps:
         {
           "name": "crank",
           "condition": "(${{ parameters.condition }})",
+          "retries": 1,
           "args": [ "${{ s.arguments }} ${{ parameters.arguments }} --application.noClean true --no-metadata --no-measurements --session $(session) --description \"${{ s.displayName }} $(System.JobDisplayName)\" --property buildId=\"$(buildId)\" --property buildNumber=\"$(buildNumber)\" --command-line-property --table TrendBenchmarks --sql SQL_CONNECTION_STRING --chart" ] 
         }
diff --git a/build/frameworks-scenarios.yml b/build/frameworks-scenarios.yml
index 3d8258b5f..24209af5b 100644
--- a/build/frameworks-scenarios.yml
+++ b/build/frameworks-scenarios.yml
@@ -65,7 +65,6 @@ steps:
   - task: PublishToAzureServiceBus@1
     condition: succeededOrFailed()
     displayName: ${{ s.displayName }}
-    retryCountOnTaskFailure: 1
     inputs:
       connectedServiceName: ${{ parameters.connection }}
       waitForCompletion: true
@@ -74,5 +73,6 @@ steps:
         {
           "name": "crank",
           "condition": "(${{ parameters.condition }})",
+          "retries": 1,
           "args": [ "${{ s.arguments }} ${{ parameters.arguments }} --application.noClean true --no-metadata --no-measurements --session $(session) --description \"${{ s.displayName }} $(System.JobDisplayName)\" --property buildId=\"$(buildId)\" --property buildNumber=\"$(buildNumber)\" --command-line-property --table TrendBenchmarks --sql SQL_CONNECTION_STRING --chart" ] 
         }
diff --git a/build/mono-database-scenarios.yml b/build/mono-database-scenarios.yml
index 76cb459b6..3bb4420e2 100644
--- a/build/mono-database-scenarios.yml
+++ b/build/mono-database-scenarios.yml
@@ -39,7 +39,6 @@ steps:
       displayName: "${{ s.displayName }} - ${{ runtime.displayName }}"
       condition: succeededOrFailed()
       timeoutInMinutes: 60
-      retryCountOnTaskFailure: 1
       inputs:
         connectedServiceName: ${{ parameters.connection }}
         waitForCompletion: true
diff --git a/build/mono-scenarios.yml b/build/mono-scenarios.yml
index 236e8e423..d45916fa4 100644
--- a/build/mono-scenarios.yml
+++ b/build/mono-scenarios.yml
@@ -47,7 +47,6 @@ steps:
       displayName: "${{ s.displayName }} - ${{ runtime.displayName }}"
       condition: succeededOrFailed()
       timeoutInMinutes: 60
-      retryCountOnTaskFailure: 1
       inputs:
         connectedServiceName: ${{ parameters.connection }}
         waitForCompletion: true
diff --git a/build/mvc-scenarios.yml b/build/mvc-scenarios.yml
index 8235a7b70..3d87e55b2 100644
--- a/build/mvc-scenarios.yml
+++ b/build/mvc-scenarios.yml
@@ -87,7 +87,6 @@ steps:
     - task: PublishToAzureServiceBus@1
       condition: succeededOrFailed()
       displayName: ${{ s.displayName }}
-      retryCountOnTaskFailure: 1
       inputs:
         connectedServiceName: ${{ parameters.connection }}
         waitForCompletion: true
@@ -96,6 +95,7 @@ steps:
           {
             "name": "crank",
             "condition": "(${{ parameters.condition }})",
+            "retries": 1,
             "args": [ "${{ s.arguments }} $(azureProfile) ${{ parameters.arguments }} --config https://raw.githubusercontent.com/aspnet/Benchmarks/main/scenarios/steadystate.profile.yml --application.framework net8.0 --application.options.collectCounters true --application.collectDependencies true --no-metadata --no-measurements --session $(session) --description \"${{ s.displayName }} $(System.JobDisplayName)\" --property buildId=\"$(buildId)\" --property buildNumber=\"$(buildNumber)\" --command-line-property --table MvcBenchmarks --sql SQL_CONNECTION_STRING --chart" ]
           }
 
diff --git a/build/nativeaot-scenarios.yml b/build/nativeaot-scenarios.yml
index 677a61331..68592200a 100644
--- a/build/nativeaot-scenarios.yml
+++ b/build/nativeaot-scenarios.yml
@@ -135,7 +135,6 @@ steps:
   - task: PublishToAzureServiceBus@1
     displayName: "${{ s.displayName }}"
     condition: succeededOrFailed()
-    retryCountOnTaskFailure: 1
     inputs:
       connectedServiceName: ${{ parameters.connection }}
       waitForCompletion: true
@@ -144,5 +143,6 @@ steps:
         {
           "name": "crank",
           "condition": "(${{ parameters.condition }}) && (${{ s.condition }})",
+          "retries": 1,
           "args": [ "${{ s.arguments }} ${{ parameters.arguments }} --config https://raw.githubusercontent.com/aspnet/Benchmarks/main/scenarios/steadystate.profile.yml --application.framework net8.0 --application.options.collectCounters true --no-metadata --no-measurements --session $(session) --description \"${{ s.displayName }} $(System.JobDisplayName)\" --property buildId=\"$(buildId)\" --property buildNumber=\"$(buildNumber)\" --command-line-property --table NativeAotBenchmarks --sql SQL_CONNECTION_STRING --chart" ]
         }
diff --git a/build/signalr-scenarios.yml b/build/signalr-scenarios.yml
index bb6c02570..537a6299f 100644
--- a/build/signalr-scenarios.yml
+++ b/build/signalr-scenarios.yml
@@ -55,7 +55,6 @@ steps:
         condition: succeededOrFailed()
         enabled: ${{ not( and( eq(transport.displayName, 'ServerSentEvents'), eq(protocol.displayName, 'MessagePack'))) }}
         displayName: ${{ s.displayName }} ${{ transport.displayName }} ${{ protocol.displayName }}
-        retryCountOnTaskFailure: 1
         inputs:
           connectedServiceName: ${{ parameters.connection }}
           waitForCompletion: true
@@ -64,6 +63,7 @@ steps:
             {
               "timeout": "00:5:00",
               "condition": "${{ parameters.condition }}",
+              "retries": 1,
               "name": "crank",
               "args": [ "${{ s.arguments }} ${{ transport.arguments }} ${{ protocol.arguments }} --application.options.collectCounters true --load.options.collectCounters true ${{ parameters.arguments }} --load.channel edge --load.framework net8.0 --warmup.channel edge --warmup.framework net8.0 --application.framework net8.0 --session $(session) --command-line-property --table SignalRBenchmarks --sql SQL_CONNECTION_STRING --chart --no-measurements --no-metadata --warmup.options.discardResults true" ]
             }
diff --git a/build/trend-database-scenarios.yml b/build/trend-database-scenarios.yml
index d4bc56d86..d2808d501 100644
--- a/build/trend-database-scenarios.yml
+++ b/build/trend-database-scenarios.yml
@@ -46,7 +46,6 @@ steps:
     displayName: "${{ s.displayName }}"
     condition: succeededOrFailed()
     timeoutInMinutes: 10
-    retryCountOnTaskFailure: 1
     inputs:
       connectedServiceName: ${{ parameters.connection }}
       waitForCompletion: true
@@ -55,5 +54,6 @@ steps:
         {
           "name": "crank",
           "condition": "(${{ parameters.condition }})",
+          "retries": 1,
           "args": [ "${{ s.arguments }} $(azureProfile) --config https://raw.githubusercontent.com/aspnet/Benchmarks/main/scenarios/steadystate.profile.yml --application.framework net8.0 ${{ parameters.arguments }} --application.options.collectCounters true --application.collectDependencies true --no-metadata --no-measurements --session $(session) --description \"${{ s.displayName }} $(System.JobDisplayName)\" --property buildId=\"$(buildId)\" --property buildNumber=\"$(buildNumber)\" --command-line-property --table TrendBenchmarks --sql SQL_CONNECTION_STRING --chart" ]
         }
diff --git a/build/trend-scenarios.yml b/build/trend-scenarios.yml
index e4d1f0f07..fbb81fcd7 100644
--- a/build/trend-scenarios.yml
+++ b/build/trend-scenarios.yml
@@ -85,7 +85,6 @@ steps:
     displayName: "${{ s.displayName }}"
     condition: succeededOrFailed()
     timeoutInMinutes: 10
-    retryCountOnTaskFailure: 1
     inputs:
       connectedServiceName: ${{ parameters.connection }}
       waitForCompletion: true
@@ -94,5 +93,6 @@ steps:
         {
           "name": "crank",
           "condition": "(${{ parameters.condition }})",
+          "retries": 1,
           "args": [ "${{ s.arguments }} $(azureProfile) --config https://raw.githubusercontent.com/aspnet/Benchmarks/main/scenarios/steadystate.profile.yml --application.framework net8.0 --application.collectDependencies true ${{ parameters.arguments }} --application.options.collectCounters true --no-metadata --no-measurements --session $(session) --description \"${{ s.displayName }} $(System.JobDisplayName)\" --property buildId=\"$(buildId)\" --property buildNumber=\"$(buildNumber)\" --command-line-property --table TrendBenchmarks --sql SQL_CONNECTION_STRING --chart" ]
         }