diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml
index 9dcd525866a9b..ca1dc6c212356 100644
--- a/.github/workflows/assemble.yml
+++ b/.github/workflows/assemble.yml
@@ -11,6 +11,12 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-15, ubuntu-24.04-arm]
     steps:
       - uses: actions/checkout@v5
+      # https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
+      - name: Remove unnecessary files Linux
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v5
         with:
diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
index b6cb165cb6333..20b30ef845daa 100644
--- a/distribution/archives/build.gradle
+++ b/distribution/archives/build.gradle
@@ -28,7 +28,7 @@
  * under the License.
  */
 
-import org.opensearch.gradle.JavaPackageType 
+import org.opensearch.gradle.JavaPackageType
 
 apply plugin: 'opensearch.internal-distribution-archive-setup'
 
@@ -193,7 +193,7 @@ distribution_archives {
     }
   }
 
-  
+
   linuxPpc64leTar {
     archiveClassifier = 'linux-ppc64le'
     content {
@@ -244,6 +244,16 @@ subprojects {
   group = "org.opensearch.distribution"
 }
 
+tasks.configureEach { t ->
+  if (t.name ==~ /^build.+Tar$/) {
+    def base = t.name - 'Tar'   // buildLinuxTar -> buildLinux
+    def stage = tasks.findByName(base)
+    if (stage != null) {
+      t.dependsOn(stage)
+    }
+  }
+}
+
 tasks.each {
   if (it.name.startsWith("build")) {
     it.dependsOn project(':libs:agent-sm:agent').assemble