diff --git a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
index 47c8e6bb94..37b65e320c 100644
--- a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
+++ b/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
@@ -19,11 +19,19 @@
 
     <Target Name="ClearUmbracoAssets" BeforeTargets="Clean">
         <ItemGroup>
-            <UmbracoPackageDir Include="$(MSBuildProjectDirectory)\umbraco\" />
+            <UmbracoConfigPackageDir Include="$(MSBuildProjectDirectory)\umbraco\config\" />
+            <UmbracoPartialViewMacrosPackageDir Include="$(MSBuildProjectDirectory)\umbraco\PartialViewMacros\" />
+            <UmbracoUmbracoBackOfficeMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoBackOffice\" />
+            <UmbracoUmbracoInstallDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoInstall\" />
+            <UmbracoUmbracoWebsiteMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoWebsite\" />
             <WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\umbraco\" />
         </ItemGroup>
         <Message Text="Clear old umbraco data"  Importance="high" />
-        <RemoveDir Directories="@(UmbracoPackageDir)"  />
+        <RemoveDir Directories="@(UmbracoConfigPackageDir)"  />
+        <RemoveDir Directories="@(UmbracoPartialViewMacrosPackageDir)"  />
+        <RemoveDir Directories="@(UmbracoUmbracoBackOfficeMacrosDir)"  />
+        <RemoveDir Directories="@(UmbracoUmbracoInstallDir)"  />
+        <RemoveDir Directories="@(UmbracoUmbracoWebsiteMacrosDir)"  />
         <RemoveDir Directories="@(WwwrootUmbracoPackageDir)"  />
     </Target>