diff --git a/msi/build/A2Staging/Scripts/assembleCAVE.ps1 b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
index 8ec84ede48..cb45da2e6e 100644
--- a/msi/build/A2Staging/Scripts/assembleCAVE.ps1
+++ b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
@@ -1,19 +1,35 @@
-function installCAVERepository([string]$feature_group, [string]$repo)
+function installCAVERepository([string]$feature_group, [string]$component, [string]$repo)
 {
+    $component_zip = $component + ".zip"
+    New-Item -path ${A2_PREPARE_CAVE_DIR} `
+        -name $component -type directory | Out-Null
+    if ($? -ne $true) { EXIT 1; }
+    pushd .
+    cd ${A2_PREPARE_CAVE_DIR}/$component
+    jar xvf ${A2_PREPARE_CAVE_DIR}/$component_zip
+    popd
+
     $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
+    jar xvf ${A2_PREPARE_CAVE_DIR}/$component/awips2/cave/.repository/$repo_zip
     popd
 
     .\cave.exe -nosplash -application org.eclipse.equinox.p2.director `
         -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
+    $etc_directory = ${A2_PREPARE_CAVE_DIR} + "\" + ${component} + "\awips2\cave\etc"
+    if ( Test-Path ${etc_directory} ) {
+        echo "Copying etc directory to destination ..."
+        Copy-Item ${etc_directory} -destination ${A2_PREPARE_CAVE_DIR}\cave -recurse -force
+        if ($? -ne $true) { EXIT 1; }
+    }
+    
+    Remove-Item -recurse -force ${A2_PREPARE_CAVE_DIR}/$component
     if ($? -ne $true) { EXIT 1; } 
     
     echo "`n"
@@ -30,10 +46,11 @@ foreach ($feature in $feature_list)
 {
     Write-Host Installing Feature: $feature
     $feature_group = $feature + ".feature.group"
+    $component = $feature + "-win32.x86"
     $repo = $feature + "-repo-win32.x86"
     
     installCAVERepository -feature_group "$feature_group" `
-        -repo "$repo" 
+        -component "$component" -repo $repo 
 }
 popd
 EXIT 0
\ No newline at end of file