diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index d1b7ba94..6d43472d 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -8,7 +8,7 @@ trigger: none
 pr: none
 
 variables:
-  versionMajor: 11
+  versionMajor: 0
   versionMinor: 2405
   versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)]
   versionPatch: 0
diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml
index 76d3b169..ea371a2a 100644
--- a/build/pipelines/templates/package-msixbundle.yaml
+++ b/build/pipelines/templates/package-msixbundle.yaml
@@ -20,7 +20,7 @@ jobs:
       in(dependencies.Buildx86.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
       in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
       in(dependencies.BuildARM64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
-    ) 
+    )
   variables:
     skipComponentGovernanceDetection: true
     StoreBrokerMediaRootPath: $(TEMP)\SBMedia
@@ -41,7 +41,7 @@ jobs:
         displayName: Publish MsixBundleSigned artifact
         targetPath: $(Build.ArtifactStagingDirectory)\msixBundle
         artifactName: msixBundleSigned
-      - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:      
+      - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
         - output: pipelineArtifact
           displayName: Publish StoreBroker Payload artifact
           targetPath: $(StoreBrokerPackagePath)
@@ -151,7 +151,7 @@ jobs:
             }
           ]
 
-    - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:      
+    - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
       - powershell: |
           # Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone.
           $enUSPdpFilePath = "$(Build.SourcesDirectory)\PDP\en-US\PDP.xml"
@@ -170,11 +170,11 @@ jobs:
           vstsFeed: WindowsInboxApps
           vstsFeedPackage: calculator-pdp-media
           vstsPackageVersion: $(SBMediaReleaseVersion)
-      
-      - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
+
+      - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
         displayName: Create StoreBroker Payload
         inputs:
-          serviceEndpoint: Calculator StoreBroker Connection
+          ConnectedServiceNameARM: Calculator StoreBroker SNI
           sbConfigPath: Tools/Build/StoreBroker/SBCalculatorConfig.json
           sourceFolder: $(Build.ArtifactStagingDirectory)/msixBundle
           contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
diff --git a/build/pipelines/templates/release-store.yaml b/build/pipelines/templates/release-store.yaml
index f8e3e245..491a4d90 100644
--- a/build/pipelines/templates/release-store.yaml
+++ b/build/pipelines/templates/release-store.yaml
@@ -17,11 +17,11 @@ jobs:
     displayName: Download storeBrokerPayload artifact
     artifact: storeBrokerPayload
 
-  - task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@2
+  - task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@3
     displayName: Flight StoreBroker Payload to team ring
     name: StoreBrokerFlight
     inputs:
-      serviceEndpoint: Calculator StoreBroker Connection
+      ConnectedServiceNameARM: Calculator StoreBroker SNI
       appId: $(AppId)
       flightId: $(FlightId)
       inputMethod: JsonAndZip
@@ -42,4 +42,4 @@ jobs:
       submissionId: $(StoreBrokerFlight.WS_SubmissionId)
       submissionDataPath: $(StoreBrokerPackagePath)\SBCalculator.json
       packagePath: $(StoreBrokerPackagePath)\SBCalculator.zip
-      serviceEndpoint: AeroUpload-APS-Calculator
\ No newline at end of file
+      serviceEndpoint: AeroUpload-APS-Calculator