diff --git a/eng/pipelines/arcade/variables.yml b/eng/pipelines/arcade/variables.yml
index 22f6c9f79912..f256bcacec29 100644
--- a/eng/pipelines/arcade/variables.yml
+++ b/eng/pipelines/arcade/variables.yml
@@ -25,7 +25,7 @@ variables:
 - name: TreatWarningsAsErrors
   value: false
 - name: _OfficialBuildIdArgs
-  value: /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
+  value: ''
 - name: ApiScanAppId
   value: cbde2fca-1ca1-47f7-8212-fcdf1a556eb2
 - name: ApiScanTenantId
@@ -33,7 +33,7 @@ variables:
 - name: ApiScanServiceConnectionId
   value: 334a6802-ebad-4fb1-bc3b-105bcc70bda2
 # Produce test-signed build for PR and Public builds
-- ${{ if or(eq(variables['_RunAsPublic'], 'true'), eq(variables['Build.Reason'], 'PullRequest')) }}:
+- ${{ if eq(variables['_RunAsPublic'], 'true') }}:
   # needed for darc (dependency flow) publishing
   - name: _PublishArgs
     value: ''
@@ -45,7 +45,7 @@ variables:
   - name: _SignArgs
     value: '/p:DotNetSignType=$(_SignType) /p:TeamName=$(TeamName)'
 # Set up non-PR build from internal project
-- ${{ if and(ne(variables['_RunAsPublic'], 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+- ${{ if or(eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
   # needed for darc (dependency flow) publishing
   - name: _PublishArgs
     value: >-
diff --git a/eng/pipelines/ci-official.yml b/eng/pipelines/ci-official.yml
index 4713e9087c49..72b00fa8ceb7 100644
--- a/eng/pipelines/ci-official.yml
+++ b/eng/pipelines/ci-official.yml
@@ -35,7 +35,6 @@ variables:
 - template: /eng/common/templates/variables/pool-providers.yml@self
 - template: /eng/pipelines/common/variables.yml@self
 - template: /eng/pipelines/arcade/variables.yml@self
-- group: DotNetBuilds storage account read tokens
 - group: AzureDevOps-Artifact-Feeds-Pats
 
 parameters:
diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index f392f5fe8487..dab3fc9d08e5 100644
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@@ -49,17 +49,16 @@ variables:
   value: true
 - name: _RunAsInternal
   value: false
-- name: _InternalBuildArgs
-  value: ''
 - name: cfsNugetWarnLevel
   value: warn
 - name: nugetMultiFeedWarnLevel
   value: none
 
+- group: MAUI # This is the main MAUI variable group that contains secrets for the apple certificate
+
 # Variable groups required for all builds
 - ${{ if and(ne(variables['Build.DefinitionName'], 'maui-pr'), ne(variables['Build.DefinitionName'], 'dotnet-maui'),  ne(variables['Build.DefinitionName'], 'maui-pr-devicetests')) }}:
   - group: maui-provisionator # This is just needed for the provisionator
-  - group: MAUI # This is the main MAUI variable group that contains secret for the apple certificate
 
 - ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
   - name: internalProvisioning
@@ -76,8 +75,6 @@ variables:
 
     - group: DotNetBuilds storage account read tokens
     - group: AzureDevOps-Artifact-Feeds-Pats
-    - name: _InternalBuildArgs
-      value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
 
 - ${{ if eq(variables['Build.DefinitionName'], 'dotnet-maui') }}:
   - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
diff --git a/eng/pipelines/maui-release-internal.yml b/eng/pipelines/maui-release-internal.yml
index 06e49fb4b69c..1970dc3e551a 100644
--- a/eng/pipelines/maui-release-internal.yml
+++ b/eng/pipelines/maui-release-internal.yml
@@ -57,7 +57,6 @@ parameters:
 variables:
 - template: /eng/common/templates/variables/pool-providers.yml@self
 
-- group: DotNetBuilds storage account read tokens
 - group: AzureDevOps-Artifact-Feeds-Pats
 - group: maui-nuget-release # maui-nuget-release provides: pat--nuget--xamarinc--push--wildcard
 
diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj
index 503b8f3ba368..5cab15a090ed 100644
--- a/src/DotNet/DotNet.csproj
+++ b/src/DotNet/DotNet.csproj
@@ -5,10 +5,10 @@
     <InstallWorkloadPacks Condition=" '$(InstallWorkloadPacks)' == '' ">true</InstallWorkloadPacks>
     <InstallDotNet Condition=" '$(InstallDotNet)' == '' ">true</InstallDotNet>
     <InternalAzureFeed>https://ci.dot.net/internal</InternalAzureFeed>
-    <DotNetFeedUrl>https://dotnetbuilds.blob.core.windows.net/public</DotNetFeedUrl>
+    <DotNetFeedUrl>https://ci.dot.net/public</DotNetFeedUrl>
     <NugetArtifactsPath>$(MauiRootDirectory)/artifacts</NugetArtifactsPath>
     <PrivateSdk>$(PRIVATE_BUILD)</PrivateSdk>
-    <PrivateSdk  Condition=" '$(PrivateSdk)' == ''">false</PrivateSdk>
+    <PrivateSdk Condition=" '$(PrivateSdk)' == ''">false</PrivateSdk>
     <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
     <_SkipUpdateBuildNumber>true</_SkipUpdateBuildNumber>
   </PropertyGroup>