diff --git a/.gitignore b/.gitignore
index 722d193462..51dad2a822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ settings.json
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+[Rr]elease[Ss]tatic/
 [Rr]eleases/
 x64/
 x86/
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d800201612..b05e7df7ed 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -118,7 +118,8 @@ jobs:
                     /p:AppxBundlePlatforms="$(buildPlatform)"
                     /p:AppxPackageDir="$(appxPackageDir)"
                     /p:AppxBundle=Always
-                    /p:UapAppxPackageBuildMode=SideloadOnly'
+                    /p:UapAppxPackageBuildMode=SideloadOnly
+                    /p:WingetCleanIntermediateFiles=true'
       maximumCpuCount: true
 
   - task: MSBuild@1
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 67f974626b..5b0fc3e1b4 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -26,5 +26,10 @@
   <!-- For C# -->
   <PropertyGroup Condition="'$(WinGetMacros)' != ''">
     <DefineConstants>$(WinGetMacros)$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
+  </PropertyGroup>
+
+  <!-- To prevent build agents from running out of disk space, clean as we go. -->
+  <Target Name="CleanIntermediateFiles" AfterTargets="Build" Condition="'$(WingetCleanIntermediateFiles)'=='true'">
+    <RemoveDir Directories="$(IntDir)" />
+  </Target>
 </Project>