diff --git a/.github/workflows/build_arm.yaml b/.github/workflows/build_arm.yaml
index 02e37fe57e..f8944f9a22 100644
--- a/.github/workflows/build_arm.yaml
+++ b/.github/workflows/build_arm.yaml
@@ -17,7 +17,7 @@ env:
 jobs:
   build-linux-gcc5:
     name: Linux GCC
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/build_nolto.yaml b/.github/workflows/build_nolto.yaml
index ad48934a31..a719457b25 100644
--- a/.github/workflows/build_nolto.yaml
+++ b/.github/workflows/build_nolto.yaml
@@ -17,7 +17,7 @@ env:
 jobs:
   build-linux-arm:
     name: Linux GCC ARM
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c
index 05052f2ba5..3701a88e2d 100644
--- a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c
+++ b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.c
@@ -1008,7 +1008,7 @@ CEntryPoint (
   IN UINTN  Arg3
   )
 {
-  PE_COFF_LOADER_IMAGE_CONTEXT        ImageContext;
+  UEFI_IMAGE_LOADER_IMAGE_CONTEXT     ImageContext;
   ARM_SVC_ARGS                        EventCompleteSvcArgs;
   EFI_STATUS                          Status;
   COMM_PROTOCOL                       CommProtocol;
@@ -1068,7 +1068,8 @@ CEntryPoint (
              &ImageContext,
              TeData,
              TeDataSize,
-             UEFI_IMAGE_SOURCE_FV
+             UEFI_IMAGE_SOURCE_FV,
+             UefiImageOriginFv
              );
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "Unable to locate Standalone MM Core PE-COFF Section information - %r\n", Status));
diff --git a/BaseTools/Source/C/VolInfo/VolInfo.h b/BaseTools/Source/C/VolInfo/VolInfo.h
index 377cde80f7..91d02c04bb 100644
--- a/BaseTools/Source/C/VolInfo/VolInfo.h
+++ b/BaseTools/Source/C/VolInfo/VolInfo.h
@@ -9,8 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _VOLINFO_H_
 #define _VOLINFO_H_ 1
 
-#define PI_SPECIFICATION_VERSION  0x00010000
-
 #define EFI_DEP_BEFORE    0x00
 #define EFI_DEP_AFTER     0x01
 #define EFI_DEP_PUSH      0x02
diff --git a/Ext4Pkg/Ext4Pkg.dsc b/Ext4Pkg/Ext4Pkg.dsc
index 18cfc102b8..0a9032eb79 100644
--- a/Ext4Pkg/Ext4Pkg.dsc
+++ b/Ext4Pkg/Ext4Pkg.dsc
@@ -47,11 +47,6 @@
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   BaseUcs2Utf8Lib|RedfishPkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf
 
-  #
-  # Required for stack protector support
-  #
-  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
-
 ###################################################################################################
 #
 # Components Section - list of the modules and components that will be processed by compilation
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibStandaloneMm.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibStandaloneMm.c
index c1ee55bb2e..16accb17f6 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibStandaloneMm.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibStandaloneMm.c
@@ -54,6 +54,8 @@ VarCheckHiiLibReceiveHiiBinHandler (
 {
   EFI_STATUS  Status;
 
+  Status = EFI_INVALID_PARAMETER;
+
   //
   // If input is invalid, stop processing this SMI
   //
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 5202c71b39..5c93be7ca8 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -103,11 +103,11 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecApicPageTableBase|gUefiOvmfPkgTokenSpaceGui
 0x011000|0x00F000
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize
 
-0x020000|0x120000
+0x020000|0x130000
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize
 FV = PEIFV
 
-0x140000|0xE40000
+0x150000|0xE30000
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize
 FV = DXEFV
 
diff --git a/OvmfPkg/Tcg/TdTcg2Dxe/MeasureBootPeCoff.c b/OvmfPkg/Tcg/TdTcg2Dxe/MeasureBootPeCoff.c
index e6e372b6b6..68ebd9ad97 100644
--- a/OvmfPkg/Tcg/TdTcg2Dxe/MeasureBootPeCoff.c
+++ b/OvmfPkg/Tcg/TdTcg2Dxe/MeasureBootPeCoff.c
@@ -131,7 +131,13 @@ MeasurePeImageAndExtend (
   //
   // Get information about the image being loaded
   //
-  Status = UefiImageInitializeContext (&ImageContext, (VOID *) (UINTN) ImageAddress, ImageSize);
+  Status = UefiImageInitializeContext (
+             &ImageContext,
+             (VOID *)(UINTN)ImageAddress,
+             (UINT32)ImageSize,
+             UEFI_IMAGE_SOURCE_FV,
+             UefiImageOriginFv
+             );
   if (EFI_ERROR (Status)) {
     //
     // The information can't be got from the invalid PeImage
diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
index d7686251f4..fb13463ea0 100644
--- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
+++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
@@ -58,6 +58,7 @@
   Tcg2PhysicalPresenceLib
   PcdLib
   HobLib
+  IntrinsicLib
 
 [Guids]
   gEfiTpmDeviceInstanceTpm20DtpmGuid                            ## PRODUCES           ## GUID       # TPM device identifier
diff --git a/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c b/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c
index 375eb6e4aa..1092a30d28 100644
--- a/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c
+++ b/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c
@@ -1654,7 +1654,7 @@ EfiGetMemoryAttributes (
 
   // Make sure AddressEncMask is contained to smallest supported address field.
   //
-  AddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGING_1G_ADDRESS_MASK_64;
+  AddressEncMask = mPlatformInfoHob2->PteMemoryEncryptionAddressOrMask & PAGING_1G_ADDRESS_MASK_64;
 
   GetCurrentPagingContext (&CurrentPagingContext);
 
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
index 4e02f35fa2..7d31322266 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c
@@ -8,7 +8,7 @@
 
 #include <PiSmm.h>
 #include "CpuExceptionCommon.h"
-#include <Library/SmmServicesTableLib.h>
+// #include <Library/SmmServicesTableLib.h>
 #include <Guid/DebugImageInfoTable.h>
 
 CONST UINTN  mDoFarReturnFlag = 1;
@@ -131,18 +131,18 @@ InternalGetSystemConfigurationTable (
   OUT VOID      **Table
   )
 {
-  UINTN             Index;
-
-  ASSERT (TableGuid != NULL);
-  ASSERT (Table != NULL);
-
-  *Table = NULL;
-  for (Index = 0; Index < gSmst->NumberOfTableEntries; Index++) {
-    if (CompareGuid (TableGuid, &(gSmst->SmmConfigurationTable[Index].VendorGuid))) {
-      *Table = gSmst->SmmConfigurationTable[Index].VendorTable;
-      return EFI_SUCCESS;
-    }
-  }
+  // UINTN             Index;
+  //
+  // ASSERT (TableGuid != NULL);
+  // ASSERT (Table != NULL);
+  //
+  // *Table = NULL;
+  // for (Index = 0; Index < gSmst->NumberOfTableEntries; Index++) {
+  //   if (CompareGuid (TableGuid, &(gSmst->SmmConfigurationTable[Index].VendorGuid))) {
+  //     *Table = gSmst->SmmConfigurationTable[Index].VendorTable;
+  //     return EFI_SUCCESS;
+  //   }
+  // }
 
   return EFI_NOT_FOUND;
 }
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.c
index c6df9358eb..291759f479 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.c
@@ -182,20 +182,6 @@ DumpModuleInfoByIp (
   IN  UINTN  CallerIpAddress
   )
 {
-  UINTN  Pe32Data;
-  VOID   *PdbPointer;
-
-  //
-  // Find Image Base
-  //
-  Pe32Data = PeCoffSearchImageBase (CallerIpAddress);
-  if (Pe32Data != 0) {
-    DEBUG ((DEBUG_ERROR, "It is invoked from the instruction before IP(0x%p)", (VOID *)CallerIpAddress));
-    PdbPointer = PeCoffLoaderGetPdbPointer ((VOID *)Pe32Data);
-    if (PdbPointer != NULL) {
-      DEBUG ((DEBUG_ERROR, " in module (%a)\n", PdbPointer));
-    }
-  }
 }
 
 /**
@@ -1498,33 +1484,6 @@ ConfigSmmCodeAccessCheck (
   PERF_FUNCTION_END ();
 }
 
-/**
-  Allocate pages for code.
-
-  @param[in]  Pages Number of pages to be allocated.
-
-  @return Allocated memory.
-**/
-VOID *
-AllocateCodePages (
-  IN UINTN  Pages
-  )
-{
-  EFI_STATUS            Status;
-  EFI_PHYSICAL_ADDRESS  Memory;
-
-  if (Pages == 0) {
-    return NULL;
-  }
-
-  Status = gMmst->MmAllocatePages (AllocateAnyPages, EfiRuntimeServicesCode, Pages, &Memory);
-  if (EFI_ERROR (Status)) {
-    return NULL;
-  }
-
-  return (VOID *)(UINTN)Memory;
-}
-
 /**
   Perform the pre tasks.
 
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.inf b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.inf
index d0ae5e709d..bc13e266f9 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.inf
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.inf
@@ -79,7 +79,6 @@
   CpuLib
   ReportStatusCodeLib
   SmmCpuFeaturesLib
-  PeCoffGetEntryPointLib
   PerformanceLib
   CpuPageTableLib
   MmSaveStateLib
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
index 12fdf7463f..de28bacb65 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/SmmServicesTableLib.h>
 #include <Library/DebugLib.h>
 
 #include "PiSmmCpuCommon.h"