diff --git a/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.props b/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.props
index 56e2faf4..4b575d0e 100644
--- a/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.props
+++ b/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.props
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <PGOBuildMode Condition="'$(PGOBuildMode)'==''">Optimize</PGOBuildMode>
+        <EnablePGOCodeGen Condition="'$(EnablePGOCodeGen)'==''">true</EnablePGOCodeGen>
     </PropertyGroup>
   
 </Project>
\ No newline at end of file
diff --git a/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.targets b/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.targets
index b46488dc..33c4be2c 100644
--- a/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.targets
+++ b/Tools/PGO/build/native/Microsoft.WindowsCalculator.PGO.targets
@@ -1,40 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <PropertyGroup>
-        <VC_PGO_RunTime_Dir>$(VCToolsInstallDir)bin\Host$(PlatformShortName)\$(PlatformShortName)</VC_PGO_RunTime_Dir>
-        <VC_PGO_RunTime_Dir Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">$(VCToolsInstallDir)bin\$(PlatformShortName)</VC_PGO_RunTime_Dir>
-        <ProfileGuidedDatabaseFileName>$(MSBuildThisFileDirectory)..\..\tools\$(PlatformShortName)\Calculator.pgd</ProfileGuidedDatabaseFileName>
+    <!-- Enable PGO optimization only for Release builds. -->
+    <PropertyGroup Condition="'$(Configuration)' == 'Release' and '$(EnablePGOCodeGen)' == 'true'">
+        <IlcParameters>$(IlcParameters) /pgu /pgd:"$(MSBuildThisFileDirectory)..\..\tools\$(Platform)\Calculator.pgd"</IlcParameters>
     </PropertyGroup>
 
-    <!-- Enable PGO optimization only for Release builds. -->
-    <ItemDefinitionGroup Condition="'$(Configuration)' == 'Release' and '$(PGOBuildMode)' == 'Instrument'">
-        <Link>
-            <LinkTimeCodeGeneration>PGInstrument</LinkTimeCodeGeneration>
-            <AdditionalDependencies Condition="'$(Platform)'=='ARM'">$(VC_ReferencesPath_VC_ARM)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-            <AdditionalDependencies Condition="'$(Platform)'=='ARM64'">$(VC_ReferencesPath_VC_ARM64)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-            <AdditionalDependencies Condition="'$(Platform)'=='Win32'">$(VC_ReferencesPath_VC_x86)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-            <AdditionalDependencies Condition="'$(Platform)'=='x64'">$(VC_ReferencesPath_VC_x64)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
-        </Link>
-    </ItemDefinitionGroup>
-
-    <!-- Include pgort140.dll in the app package -->
-    <ItemGroup Condition="'$(Configuration)' == 'Release' and '$(PGOBuildMode)' == 'Instrument'">
-        <None Include="$(VC_PGO_RunTime_Dir)\pgort140.dll">
-            <Link>%(Filename)%(Extension)</Link>
-            <DeploymentContent>true</DeploymentContent>
-            <Visible>false</Visible>
-            <InProject>false</InProject>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-    <!-- Enable PGO optimization only for if the pgds file exists. -->
-    <ItemDefinitionGroup Condition="'$(Configuration)' == 'Release' and '$(PGOBuildMode)' == 'Optimize' and Exists('$(ProfileGuidedDatabaseFileName)')">
-        <Link>
-            <LinkTimeCodeGeneration>PGUpdate</LinkTimeCodeGeneration>
-            <ProfileGuidedDatabase>$(ProfileGuidedDatabaseFileName)</ProfileGuidedDatabase>
-        </Link>
-    </ItemDefinitionGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 65942a84..601813d1 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -36,6 +36,7 @@
     <AppxBundlePlatforms>$(Platform)</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <IlcParameters>/disableStackTraceMetadata /disableExceptionMessages</IlcParameters>
+    <EnablePGOCodeGen Condition="'$(Platform)' == 'ARM64'">false</EnablePGOCodeGen>
   </PropertyGroup>
   <!-- This has to be exactly in this place for this to work -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">