diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 396715ca1b..afe35f8a8b 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -51,10 +51,10 @@ DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00100000
 DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x001A5000
 
 DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x002A5000
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002D000
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002C000
 
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x002D2000
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x0002E000
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x002D1000
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x0002F000
 
 ################################################################################
 #
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 547d6a07e4..7d281ea0a7 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -52,10 +52,10 @@ DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00196000
 
 
 DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00296000
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002D000
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002C000
 
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x002C3000
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x0003D000
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x002C2000
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x0003E000
 
 ################################################################################
 #
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 21936e0c12..54ddd0089c 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1511,12 +1511,6 @@
   MSFT:*_*_X64_GENFW_FLAGS  = --keepexceptiontable
   GCC:*_*_X64_GENFW_FLAGS   = --keepexceptiontable
   INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
-!if $(TARGET) == DEBUG
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = /Od /Oy-
-!endif
-!else
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
 !endif
 
 [BuildOptions.Common.EDK]