diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
index df2e44ea40b2..9aa2c78478e0 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
@@ -164,22 +164,63 @@
       <DirectoryRef Id="INSTALLDIR">
         <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(var.ProductName)">
           <Directory Id="VersionDir" Name="$(var.ProductVersionString)">
-            <?if $(var.Platform) = "arm64" ?>
-            <Component Id="AspNetCoreModuleV2.forwarder"
-                Guid="08968573-05c1-4bf1-8879-7b818ac9525b"
-                Win64="$(var.IsWin64)">
-                <File Id="AspNetCoreModuleV2Dll.forwarder"
+            <Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
+                <?if $(var.Platform) = "arm64" ?>
+                <File Id="AspNetCoreModuleDll"
                     Name="aspnetcorev2.dll"
                     Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll"
                     DiskId="1"
                     Vital="yes"/>
-                <RegistryKey Root="HKLM"
-                    Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                    <RegistryValue Name="EventMessageFile" Type="expandable"
-                        Value="[#AspNetCoreModuleV2Dll.forwarder]" />
-                    <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
-                </RegistryKey>
+                <?else ?>
+                <File Id="AspNetCoreModuleDll"
+                    Name="aspnetcorev2.dll"
+                    Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
+                    DiskId="1"
+                    Vital="yes"/>
+                <?endif ?>
+              <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
+                <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]"/>
+                <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
+              </RegistryKey>
             </Component>
+            <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
+              <Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
+                    <?if $(var.Platform) = "arm64" ?>
+                    <File Id="AspNetCoreModuleHandlerDll"
+                        Name="aspnetcorev2_outofprocess.dll"
+                        Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
+                        DiskId="1"
+                        Vital="yes"/>
+                    <?else ?>
+                    <File Id="AspNetCoreModuleHandlerDll"
+                        Name="aspnetcorev2_outofprocess.dll"
+                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
+                        DiskId="1"
+                        Vital="yes">
+                    </File>
+                    <?endif ?>
+              </Component>
+              <?if $(var.Platform) = "arm64" ?>
+                <Component Id="AspNetCoreModuleHandler.x64"
+                    Guid="0b192457-9c6a-4703-ba6a-0c5a58b7c9cb"
+                    Win64="$(var.IsWin64)">
+                    <File Id="AspNetCoreModuleHandlerDll.x64"
+                        Name="aspnetcorev2_outofprocess_x64.dll"
+                        Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
+                        DiskId="1"
+                        Vital="yes"/>
+                </Component>
+                <Component Id="AspNetCoreModuleHandler.arm64"
+                    Guid="21cc9da0-ab0a-4717-90df-dbaaa3f68510" Win64="$(var.IsWin64)">
+                    <File Id="AspNetCoreModuleHandlerDll.arm64"
+                        Name="aspnetcorev2_outofprocess_arm64.dll"
+                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
+                        DiskId="1"
+                        Vital="yes"/>
+                </Component>
+              <?endif ?>
+            </Directory>
+            <?if $(var.Platform) = "arm64" ?>
             <Component Id="AspNetCoreModuleV2.x64"
                 Guid="1962b1b0-6345-4b37-97b3-a8f2c9e82bee"
                 Win64="$(var.IsWin64)">
@@ -210,56 +251,6 @@
                     <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
                 </RegistryKey>
             </Component>
-            <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)">
-                <Component Id="AspNetCoreModuleHandler.forwarder"
-                    Guid="51045d90-7231-480c-bac7-2969a2861ece" Win64="$(var.IsWin64)">
-                    <File Id="AspNetCoreModuleHandlerDll.forwarder"
-                        Name="aspnetcorev2_outofprocess.dll"
-                        Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
-                        DiskId="1"
-                        Vital="yes"/>
-                </Component>
-                <Component Id="AspNetCoreModuleHandler.x64"
-                    Guid="0b192457-9c6a-4703-ba6a-0c5a58b7c9cb"
-                    Win64="$(var.IsWin64)">
-                    <File Id="AspNetCoreModuleHandlerDll.x64"
-                        Name="aspnetcorev2_outofprocess_x64.dll"
-                        Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
-                        DiskId="1"
-                        Vital="yes"/>
-                </Component>
-                <Component Id="AspNetCoreModuleHandler.arm64"
-                    Guid="21cc9da0-ab0a-4717-90df-dbaaa3f68510" Win64="$(var.IsWin64)">
-                    <File Id="AspNetCoreModuleHandlerDll.arm64"
-                        Name="aspnetcorev2_outofprocess_arm64.dll"
-                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
-                        DiskId="1"
-                        Vital="yes"/>
-                </Component>
-            </Directory>
-            <?else ?>
-            <Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
-                <File Id="AspNetCoreModuleDll"
-                    Name="aspnetcorev2.dll"
-                    Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
-                    DiskId="1"
-                    Vital="yes">
-                </File>
-              <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]"/>
-                <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-              </RegistryKey>
-            </Component>
-              <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
-              <Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
-                    <File Id="AspNetCoreModuleHandlerDll"
-                        Name="aspnetcorev2_outofprocess.dll"
-                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
-                        DiskId="1"
-                        Vital="yes">
-                    </File>
-              </Component>
-            </Directory>
             <?endif ?>
           </Directory>
         </Directory>
@@ -324,16 +315,13 @@
 
         <!-- Feature Definition -->
         <Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
+            <ComponentRef Id="AspNetCoreModule"/>
+            <ComponentRef Id="AspNetCoreModuleHandler"/>
             <?if $(var.Platform) = "arm64" ?>
-            <ComponentRef Id="AspNetCoreModuleV2.forwarder" />
-            <ComponentRef Id="AspNetCoreModuleHandler.forwarder" />
             <ComponentRef Id="AspNetCoreModuleV2.x64" />
             <ComponentRef Id="AspNetCoreModuleHandler.x64" />
             <ComponentRef Id="AspNetCoreModuleV2.arm64" />
             <ComponentRef Id="AspNetCoreModuleHandler.arm64" />
-            <?else ?>
-            <ComponentRef Id="AspNetCoreModule"/>
-            <ComponentRef Id="AspNetCoreModuleHandler"/>
             <?endif ?>
             <ComponentRef Id="AspNetCoreSchema"/>
             <?if $(var.Platform) != "x86" ?>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
index f96c13979b5f..ef4e4a1216e7 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
@@ -144,20 +144,62 @@
                <Directory Id="IISModuleDirectory" Name="IIS">
                    <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="Asp.Net Core Module">
                        <Directory Id="VersionDir" Name="$(var.ProductVersionString)">
-                           <?if $(var.Platform) = "arm64" ?>
-                           <Component Id="AspNetCoreModuleV2.forwarder" Guid="4b6bb33a-01f0-48c7-bce9-5a5514ac0431" Win64="$(var.IsWin64)">
-                                <File Id="AspNetCoreModuleV2Dll.forwarder"
+                           <Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
+                             <?if $(var.Platform) = "arm64" ?>
+                             <File Id="AspNetCoreModuleV2Dll"
                                     Name="aspnetcorev2.dll"
                                     Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2.dll"
                                     DiskId="1"
-                                    Vital="yes">
-                                </File>
-                               <RemoveFile Id="AspNetCoreModuleV2Dll_Remove.forwarder" Name="aspnetcorev2.dll" On="install" />
-                               <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                                   <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.forwarder]"/>
-                                   <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-                               </RegistryKey>
+                                    Vital="yes"/>
+                             <?else ?>
+                             <File Id="AspNetCoreModuleV2Dll"
+                               Name="aspnetcorev2.dll"
+                               Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
+                               DiskId="1"
+                               Vital="yes"/>
+                             <?endif ?>
+                             <RemoveFile Id="AspNetCoreModuleV2Dll_Remove" Name="aspnetcorev2.dll" On="install" />
+                             <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
+                               <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll]"/>
+                               <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
+                             </RegistryKey>
                            </Component>
+                           <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
+                             <Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
+                               <?if $(var.Platform) = "arm64" ?>
+                               <File Id="AspNetCoreModuleHandlerDll"
+                                        Name="aspnetcorev2_outofprocess.dll"
+                                        Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
+                                        DiskId="1"
+                                        Vital="yes"/>
+                               <?else ?>
+                               <File Id="AspNetCoreModuleHandlerDll"
+                                 Name="aspnetcorev2_outofprocess.dll"
+                                 Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
+                                 DiskId="1"
+                                 Vital="yes"/>
+                               <?endif ?>
+                             </Component>
+                             <?if $(var.Platform) = "arm64" ?>
+                             <Component Id="AspNetCoreModuleHandler.x64" Guid="d9b0b5c9-8bbe-46f2-97d5-ba23d1a1ffed" Win64="$(var.IsWin64)">
+                                    <File Id="AspNetCoreModuleHandlerDll.x64"
+                                        Name="aspnetcorev2_outofprocess_x64.dll"
+                                        Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
+                                        DiskId="1"
+                                        Vital="yes">
+                                    </File>
+                             </Component>
+                             <Component Id="AspNetCoreModuleHandler.arm64" Guid="ab249ab5-9203-4fd5-87b6-8acc3e1a0702" Win64="$(var.IsWin64)">
+                                    <File Id="AspNetCoreModuleHandlerDll.arm64"
+                                        Name="aspnetcorev2_outofprocess_arm64.dll"
+                                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
+                                        DiskId="1"
+                                        Vital="yes">
+                                    </File>
+                             </Component>
+                             <?endif ?>
+                           </Directory>
+                           <?if $(var.Platform) = "arm64" ?>
                            <Component Id="AspNetCoreModuleV2.x64" Guid="325cf239-162d-4de8-97e7-642e6c66181c" Win64="$(var.IsWin64)">
                                 <File Id="AspNetCoreModuleV2Dll.x64"
                                     Name="aspnetcorev2_x64.dll"
@@ -184,54 +226,6 @@
                                    <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
                                </RegistryKey>
                            </Component>
-                           <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
-                               <Component Id="AspNetCoreModuleHandler.forwarder" Guid="4862728c-e943-49f0-901a-cd96e4bf03ef" Win64="$(var.IsWin64)">
-                                    <File Id="AspNetCoreModuleHandlerDll.forwarder"
-                                        Name="aspnetcorev2_outofprocess.dll"
-                                        Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleForwarders\aspnetcorev2_outofprocess.dll"
-                                        DiskId="1"
-                                        Vital="yes">
-                                    </File>
-                               </Component>
-                               <Component Id="AspNetCoreModuleHandler.x64" Guid="d9b0b5c9-8bbe-46f2-97d5-ba23d1a1ffed" Win64="$(var.IsWin64)">
-                                    <File Id="AspNetCoreModuleHandlerDll.x64"
-                                        Name="aspnetcorev2_outofprocess_x64.dll"
-                                        Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
-                                        DiskId="1"
-                                        Vital="yes">
-                                    </File>
-                               </Component>
-                               <Component Id="AspNetCoreModuleHandler.arm64" Guid="ab249ab5-9203-4fd5-87b6-8acc3e1a0702" Win64="$(var.IsWin64)">
-                                    <File Id="AspNetCoreModuleHandlerDll.arm64"
-                                        Name="aspnetcorev2_outofprocess_arm64.dll"
-                                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
-                                        DiskId="1"
-                                        Vital="yes">
-                                    </File>
-                               </Component>
-                           </Directory>
-                           <?else ?>
-                           <Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
-                             <File Id="AspNetCoreModuleV2Dll"
-                               Name="aspnetcorev2.dll"
-                               Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
-                               DiskId="1"
-                               Vital="yes"/>
-                             <RemoveFile Id="AspNetCoreModuleV2Dll_Remove" Name="aspnetcorev2.dll" On="install" />
-                             <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                               <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll]"/>
-                               <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-                             </RegistryKey>
-                           </Component>
-                           <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
-                             <Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
-                               <File Id="AspNetCoreModuleHandlerDll"
-                                 Name="aspnetcorev2_outofprocess.dll"
-                                 Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
-                                 DiskId="1"
-                                 Vital="yes"/>
-                             </Component>
-                           </Directory>
                            <?endif ?>
                        </Directory>
                    </Directory>
@@ -287,16 +281,13 @@
         <Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
             <ComponentRef Id="C_DiscoverabilityKey"/>
             <ComponentRef Id="AspNetCoreSchemaV2"/>
+            <ComponentRef Id="AspNetCoreModuleV2" />
+            <ComponentRef Id="AspNetCoreModuleHandler" />
             <?if $(var.Platform) = "arm64"?>
-            <ComponentRef Id="AspNetCoreModuleV2.forwarder"/>
-            <ComponentRef Id="AspNetCoreModuleHandler.forwarder"/>
             <ComponentRef Id="AspNetCoreModuleV2.x64"/>
             <ComponentRef Id="AspNetCoreModuleHandler.x64"/>
             <ComponentRef Id="AspNetCoreModuleV2.arm64"/>
             <ComponentRef Id="AspNetCoreModuleHandler.arm64"/>
-            <?else ?>
-            <ComponentRef Id="AspNetCoreModuleV2" />
-            <ComponentRef Id="AspNetCoreModuleHandler" />
             <?endif ?>
             <?if $(var.Platform) != "x86" ?>
             <ComponentRef Id="C_DiscoverabilityKeyWow"/>
@@ -323,11 +314,7 @@
         <CustomTable Id="IISGlobalModule">
             <Row>
                 <Data Column="Name">AspNetCoreModuleV2</Data>
-                <?if $(var.Platform) = "arm64" ?>
-                <Data Column="File_">AspNetCoreModuleV2Dll.forwarder</Data>
-                <?else ?>
                 <Data Column="File_">AspNetCoreModuleV2Dll</Data>
-                <?endif ?>
             </Row>
         </CustomTable>
 
@@ -347,11 +334,7 @@
             <Data Column="AreaName">ANCM</Data>
             <Data Column="AreaValue">65536</Data>
             <Data Column="BinaryName_">AncmMofFile</Data>
-            <?if $(var.Platform) = "arm64" ?>
-            <Data Column="Component_">AspNetCoreModuleV2.forwarder</Data>
-            <?else ?>
             <Data Column="Component_">AspNetCoreModuleV2</Data>
-            <?endif ?>
           </Row>
         </CustomTable>
         <!-- <?endif ?> -->
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd
index b9152822828e..80543b729c47 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd
@@ -1,2 +1,2 @@
 call %1 -host_arch=x64 -arch=arm64 -no_logo
-call build.cmd %2 %3
+call build.cmd %2 %3 %4
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd
index a3ef34304dff..7e150ccbd565 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd
@@ -1,5 +1,6 @@
 SET objDir=%1
 SET binDir=%2
+SET configuration=%3
 
 cl /nologo /c /Fo%objDir%\aspnetcorev2_arm64.obj empty.cpp
 cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
@@ -7,7 +8,7 @@ cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
 link /lib /nologo /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
 link /lib /nologo /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
 
-link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
+link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
 
 cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
 cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
@@ -15,4 +16,4 @@ cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj emp
 link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
 link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
 
-link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib
+link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj
index cc058255fa7c..012ea1d06ea2 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj
@@ -16,6 +16,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
     <MakeDir Directories="$(ObjDir);$(BinDir)" />
-    <Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir)" />
+    <Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" />
   </Target>
 </Project>