diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 4f45e35e9f..a58df6cf46 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -168,6 +168,10 @@
 			<param name="feature"
 				value="com.raytheon.uf.viz.common.core.feature" />
 		</antcall>
+                <antcall target="p2.build.repo">
+                        <param name="feature"
+                                value="com.raytheon.uf.viz.localization.perspective.feature" />
+                </antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
 				value="com.raytheon.uf.viz.core.feature" />
@@ -192,10 +196,6 @@
 			<param name="feature"
 				value="com.raytheon.uf.viz.d2d.core.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature"
-				value="com.raytheon.uf.viz.localization.perspective.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
 				value="com.raytheon.viz.radar.feature" />
diff --git a/msi/build/A2Staging/Scripts/assembleCAVE.ps1 b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
index a8a6135b4b..8ec84ede48 100644
--- a/msi/build/A2Staging/Scripts/assembleCAVE.ps1
+++ b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
@@ -1,8 +1,20 @@
-function installCAVERepository([string]$feature_group, [string]$repo_zip)
+function installCAVERepository([string]$feature_group, [string]$repo)
 {
+    $repo_zip = $repo + ".zip"
+    New-Item -path ${A2_PREPARE_CAVE_DIR} `
+        -name $repo -type directory | Out-Null
+    if ($? -ne $true) { EXIT 1; }    
+    pushd .
+    cd ${A2_PREPARE_CAVE_DIR}/$repo
+    jar xvf ${A2_PREPARE_CAVE_DIR}/$repo_zip
+    popd
+
     .\cave.exe -nosplash -application org.eclipse.equinox.p2.director `
-        -i $feature_group -repository "jar:file:///${A2_PREPARE_CAVE_DIR}\$repo_zip!" | Out-Host
-    if ($? -ne $true) { echo "ERROR: Unable to install feature: $feature_group."; echo "FATAL: Build Failed!"; EXIT 1; } 
+        -i $feature_group -repository "file:${A2_PREPARE_CAVE_DIR}/$repo" | Out-Host
+    if ($? -ne $true) { echo "ERROR: Unable to install feature: $feature_group."; echo "FATAL: Build Failed!"; EXIT 1; }
+    
+    Remove-Item -recurse -force ${A2_PREPARE_CAVE_DIR}/$repo
+    if ($? -ne $true) { EXIT 1; } 
     
     echo "`n"
 }
@@ -18,10 +30,10 @@ foreach ($feature in $feature_list)
 {
     Write-Host Installing Feature: $feature
     $feature_group = $feature + ".feature.group"
-    $repo_zip = $feature + "-repo-win32.x86.zip"
+    $repo = $feature + "-repo-win32.x86"
     
     installCAVERepository -feature_group "$feature_group" `
-        -repo_zip "$repo_zip" 
+        -repo "$repo" 
 }
 popd
 EXIT 0
\ No newline at end of file