diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index f50f864253..eb26f301ba 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -20,7 +20,7 @@
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
     <BuildTargets>DEBUG</BuildTargets>
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>
-    <OutputDirectory/>
+    <OutputDirectory>Build/EdkModule</OutputDirectory>
     <SkuInfo>
       <UiSkuName SkuID="0">DEFAULT</UiSkuName>
     </SkuInfo>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index ada68752b9..32647a5fdc 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -21,7 +21,7 @@
     <SupportedArchitectures>IA32</SupportedArchitectures>
     <BuildTargets>DEBUG</BuildTargets>
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>
-    <OutputDirectory/>
+    <OutputDirectory>Build/Nt32</OutputDirectory>
     <SkuInfo>
       <UiSkuName SkuID="0">DEFAULT</UiSkuName>
     </SkuInfo>
@@ -7332,7 +7332,7 @@
     <pathconvert property="SecMainPath" targetos="windows">
       <path path="${TARGET_DIR}/IA32"/>
     </pathconvert>
-    <echo file="${PLATFORM_DIR}/run.cmd">@REM
+    <echo file="${BUILD_DIR}/run.cmd">@REM
       @REM Copyright (c) 2006, Intel Corporation
       @REM All rights reserved. This program and the accompanying materials
       @REM are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 34ba54b6c8..8d3e78a246 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
     <BuildTargets>DEBUG</BuildTargets>
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>
-    <OutputDirectory/>
+    <OutputDirectory>Build/Mde</OutputDirectory>
   </PlatformDefinitions>
   <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>