diff --git a/.azuredevops/pipelines/template-build.yml b/.azuredevops/pipelines/template-build.yml
index d125acd4..66a5955c 100644
--- a/.azuredevops/pipelines/template-build.yml
+++ b/.azuredevops/pipelines/template-build.yml
@@ -41,23 +41,23 @@ parameters:
 jobs:
   - ${{ each item in parameters.build_matrix }}:
     - job: Build_${{ item.Key }}
-      
+
       timeoutInMinutes: 120
-      
+
       workspace:
         clean: all
-      
+
       pool:
         vmImage: ${{ item.Value.VmImage }}
-      
+
       ${{ if eq(item.Value.Container, true) }}:
         container:
           image: ${{ parameters.linux_container_image }}
-      
+
       steps:
         - checkout: self
           clean: true
-  
+
         - ${{ if eq(item.Value.Container, true) }}:
           - script: pip install -r pip-requirements.txt --upgrade
             displayName: Install and Upgrade pip Modules
@@ -70,14 +70,14 @@ jobs:
             scriptSource: 'filePath'
             scriptPath: MultiFlavorBuild.py
             arguments: --setup TOOL_CHAIN_TAG=${{ item.Value.ToolChain }}
-        
+
         - task: PythonScript@0
           displayName: Update Workspace Extdeps
           inputs:
             scriptSource: 'filePath'
             scriptPath: MultiFlavorBuild.py
             arguments: --update TOOL_CHAIN_TAG=${{ item.Value.ToolChain }}
-        
+
         - task: PythonScript@0
           displayName: 'Build Crypto Drivers'
           inputs:
@@ -111,8 +111,8 @@ jobs:
             displayName: Save Configs and License
             inputs:
               contents: |
-                MU_BASECORE\CryptoPkg\Driver\Packaging\edk2-BaseCryptoDriver.config.json
-                MU_BASECORE\CryptoPkg\Driver\Packaging\License.txt
+                CryptoBinPkg\Driver\Packaging\edk2-BaseCryptoDriver.config.json
+                CryptoBinPkg\Driver\Packaging\License.txt
               targetFolder: '$(Build.ArtifactStagingDirectory)/Extra'
               flattenFolders: true
           - task:  PublishPipelineArtifact@1
@@ -181,7 +181,7 @@ jobs:
           **/*.txt
         targetFolder: '$(Pipeline.Workspace)/Staging'
         flattenFolders: true
-    
+
     # Files in staging exists in this format
     # {FLAVOR}
     # -- CryptoPkg
@@ -230,7 +230,7 @@ jobs:
       inputs:
         targetPath: '$(Pipeline.Workspace)/FinalPackage'
         artifactName: CryptoBin_Nuget_Package
-  
+
   - ${{ if eq(parameters.publish_nuget, true) }}:
     - job: publish_package
       displayName: Publish CryptoBin_${{parameters.publish_version}}
@@ -288,7 +288,7 @@ jobs:
             --CustomLicensePath "$licenseFile";
 
             Get-Content $(Build.StagingDirectory)/NugetPackagingLog.txt;
-      
+
       - task: NuGetAuthenticate@0
         displayName: Authenticate Local Feed
 
diff --git a/CryptoBinPkg/CryptoBinPkg.dsc b/CryptoBinPkg/CryptoBinPkg.dsc
index 2ec9d737..21c1af62 100644
--- a/CryptoBinPkg/CryptoBinPkg.dsc
+++ b/CryptoBinPkg/CryptoBinPkg.dsc
@@ -58,6 +58,7 @@
   RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SmmCpuRendezvousLib|MdePkg/Library/SmmCpuRendezvousLibNull/SmmCpuRendezvousLibNull.inf
+  StackCheckFailureHookLib|MdePkg/Library/StackCheckFailureHookLibNull/StackCheckFailureHookLibNull.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
@@ -77,10 +78,17 @@
 #
 # For stack protection
 #
+[LibraryClasses.common.PEI_CORE]
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
+
+[LibraryClasses.common.PEIM, LibraryClasses.common.MM_CORE_STANDALONE, LibraryClasses.common.MM_STANDALONE]
+  NULL|MdePkg/Library/StackCheckLib/StackCheckLibStaticInit.inf
+
+[LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE, LibraryClasses.common.DXE_SMM_DRIVER, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_SAL_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
+  NULL|MdePkg/Library/StackCheckLib/StackCheckLibDynamicInit.inf
+
 [LibraryClasses.X64.SMM_CORE, LibraryClasses.X64.DXE_SMM_DRIVER, LibraryClasses.X64.MM_CORE_STANDALONE, LibraryClasses.X64.MM_STANDALONE, LibraryClasses.X64.DXE_CORE, LibraryClasses.X64.DXE_DRIVER, LibraryClasses.X64.DXE_RUNTIME_DRIVER, LibraryClasses.X64.DXE_SAL_DRIVER, LibraryClasses.X64.UEFI_DRIVER, LibraryClasses.X64.UEFI_APPLICATION]
-  NULL|MdePkg/Library/StackCheckLib/StackCheckLib.inf
   RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
-  StackCheckFailureLib|MdePkg/Library/StackCheckFailureLibNull/StackCheckFailureLibNull.inf
 
 [LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
   RngLib|MdePkg/Library/DxeRngLib/DxeRngLib.inf
@@ -98,10 +106,6 @@
   IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf
 
-  # Add support for stack protector
-  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
-  StackCheckFailureLib|MdePkg/Library/StackCheckFailureLibNull/StackCheckFailureLibNull.inf
-
 [LibraryClasses.common.PEIM]
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
diff --git a/MU_BASECORE b/MU_BASECORE
index d4cc801b..63141883 160000
--- a/MU_BASECORE
+++ b/MU_BASECORE
@@ -1 +1 @@
-Subproject commit d4cc801bc20e8e52d5eee4c2366b95891f673bc8
+Subproject commit 631418833c96f3b775a7d12b751f2ad3fa420f84