diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 6d9d94fcd0..d1cddbcdc2 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -6919,7 +6919,8 @@
   </BuildOptions>
   
   <UserExtensions UserID="TianoCore" Identifier="1">
-    <concat destfile="${FV_DIR}/FV_RECOVERY.fd" binary="true" >
+    <mkdir dir="${FV_DIR}/../../FV"/>
+    <concat destfile="${FV_DIR}/../../FV/FV_RECOVERY.fd" binary="true" >
        <fileset dir="${FV_DIR}" includes="*.fv"/>
     </concat>
   </UserExtensions>
diff --git a/EdkNt32Pkg/run.cmd b/EdkNt32Pkg/run.cmd
index 145558fa28..5f251a6cad 100644
--- a/EdkNt32Pkg/run.cmd
+++ b/EdkNt32Pkg/run.cmd
@@ -11,10 +11,6 @@
 
 @echo off
 
-:create_fd
-if not exist Build\Debug\Fv mkdir Build\Debug\Fv
-copy Build\Debug\Msft\Fv\FV_RECOVERY.fv /B + Build\Debug\Msft\Fv\NV_STORAGE.fv /B Build\Debug\Fv\Fv_Recovery.fd /B
-
 :start_secmain
 pushd .
 cd Build\DEBUG\MSFT\IA32