diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index b2436f1b..a8a7d8e7 100644
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@@ -55,7 +55,7 @@ jobs:
         downloadDirectory: $(Build.SourcesDirectory)
         vstsFeed: WindowsInboxApps
         vstsFeedPackage: calculator-internals
-        vstsPackageVersion: 0.0.106
+        vstsPackageVersion: 0.0.109
 
   - task: NuGetToolInstaller@1
     displayName: Use NuGet 6.x
@@ -84,7 +84,7 @@ jobs:
       configuration: $(BuildConfiguration)
       maximumCpuCount: true
 
-  - ${{ if eq(parameters.isReleaseBuild, true) }}:          
+  - ${{ if eq(parameters.isReleaseBuild, true) }}:
     - task: CopyFiles@2
       displayName: Copy Files for BinSkim analysis
       inputs:
diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml
index ea371a2a..b33e299e 100644
--- a/build/pipelines/templates/package-msixbundle.yaml
+++ b/build/pipelines/templates/package-msixbundle.yaml
@@ -83,7 +83,7 @@ jobs:
       itemPattern: '**/*.msix'
       targetPath: $(Build.ArtifactStagingDirectory)\drop\ARM64
 
-  - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
+  - ${{ if or(eq(parameters.createStoreBrokerPackages, true), eq(parameters.signBundle, true)) }}:
     - task: UniversalPackages@0
       displayName: Download internals package
       inputs:
@@ -91,7 +91,7 @@ jobs:
         downloadDirectory: $(Build.SourcesDirectory)
         vstsFeed: WindowsInboxApps
         vstsFeedPackage: calculator-internals
-        vstsPackageVersion: 0.0.106
+        vstsPackageVersion: 0.0.109
 
   - task: PowerShell@2
     displayName: Generate MsixBundle mapping
@@ -117,10 +117,25 @@ jobs:
       targetFolder: $(Build.ArtifactStagingDirectory)\msixBundle
 
   - ${{ if eq(parameters.signBundle, true) }}:
-    - task: EsrpCodeSigning@2
+    - pwsh: |
+        $configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-codesign.json"
+        $config = Get-Content -Raw $configPath | ConvertFrom-Json
+        $esrpClientId = $config.AppRegistrationClientId
+        $esrpTenantId = $config.AppRegistrationTenantId
+        echo ClientId:$esrpClientId, TenantId:$esrpTenantId
+        echo "##vso[task.setvariable variable=EsrpClientId]$esrpClientId"
+        echo "##vso[task.setvariable variable=EsrpTenantId]$esrpTenantId"
+      displayName: Get ESRP config
+
+    - task: EsrpCodeSigning@5
       displayName: Send msixbundle to code signing service
       inputs:
-        ConnectedServiceName: Essential Experiences Codesign
+        ConnectedServiceName: Essential Experiences Codesign ARM
+        AppRegistrationClientId: $(EsrpClientId)
+        AppRegistrationTenantId: $(EsrpTenantId)
+        AuthAKVName: EE-CodeSignKeyVault
+        AuthCertName: EE-Auth-Cert
+        AuthSignCertName: EE-Codesign-Cert
         FolderPath: $(Build.ArtifactStagingDirectory)\msixBundle
         Pattern: Microsoft.WindowsCalculator_8wekyb3d8bbwe.msixbundle
         signConfigType: inlineSignParams
diff --git a/build/pipelines/templates/release-vpack.yaml b/build/pipelines/templates/release-vpack.yaml
index 75fa4c21..9f2f21e0 100644
--- a/build/pipelines/templates/release-vpack.yaml
+++ b/build/pipelines/templates/release-vpack.yaml
@@ -35,7 +35,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsInboxApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.106
+      vstsPackageVersion: 0.0.109
 
   - pwsh: |
       $configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-auth.json"