diff --git a/.pipelines/containers/container-template.yaml b/.pipelines/containers/container-template.yaml
index fcbf88d7f2..f4f81d35eb 100644
--- a/.pipelines/containers/container-template.yaml
+++ b/.pipelines/containers/container-template.yaml
@@ -16,11 +16,40 @@ steps:
 
 - script: |
     set -e
+    echo "Disk space before cleanup..."
+    df -h /
+    echo "Removing unnecessary files to free up disk space..."
+    sudo rm -rf \
+      /opt/hostedtoolcache \
+      /opt/google/chrome \
+      /opt/microsoft/msedge \
+      /opt/microsoft/powershell \
+      /opt/pipx \
+      /usr/lib/mono \
+      /usr/local/julia* \
+      /usr/local/lib/android \
+      /usr/local/lib/node_modules \
+      /usr/local/share/chromium \
+      /usr/local/share/powershell \
+      /usr/share/dotnet \
+      /usr/share/swift
+    echo "Disk space after cleanup..."
+    df -h /
+  displayName: "Clean up disk space"
+
+- script: |
+    set -e
+    echo "=== Disk space BEFORE make image ==="
+    df -h
     if [ ${{ parameters.os }} = 'windows' ]; then export BUILDX_ACTION='--push'; fi
+    
     make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }}
+
+    echo "=== Disk space AFTER make image ==="
+    df -h
   name: image_build
   displayName: Image Build
-  retryCountOnTaskFailure: 3
+  retryCountOnTaskFailure: 2
 
 - task: AzureCLI@2
   displayName: "Logout"
diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
index 126b56d766..637067878f 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -69,7 +69,7 @@ stages:
           dependsOn: ${{ parameters.name }}
           datapath: true
           dns: true
-          portforward: true
+          portforward: ${{ eq(parameters.os, 'linux') }} # Unblock Pipeline, broken for all windows scenarios
           hostport: true
           service: true
 
diff --git a/.pipelines/singletenancy/aks/e2e-job-template.yaml b/.pipelines/singletenancy/aks/e2e-job-template.yaml
index 56690db446..87d7d5f420 100644
--- a/.pipelines/singletenancy/aks/e2e-job-template.yaml
+++ b/.pipelines/singletenancy/aks/e2e-job-template.yaml
@@ -73,7 +73,7 @@ stages:
           os: ${{ parameters.os }}
           datapath: true
           dns: true
-          portforward: true
+          portforward: ${{ eq(parameters.os, 'linux') }} # Unblock Pipeline, broken for all windows scenarios
           hybridWin: true
           service: true
           hostport: true
diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
index 2bc03a4726..bcdb069e46 100644
--- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -111,7 +111,7 @@ stages:
           dependsOn: ${{ parameters.name }}_windows
           datapath: true
           dns: true
-          portforward: true
+          portforward: ${{ eq(parameters.os, 'linux') }} # Unblock Pipeline, broken for all windows scenarios
           hostport: true
           service: true
 
@@ -123,7 +123,7 @@ stages:
           dependsOn: cni_${{ parameters.os }}
           datapath: true
           dns: true
-          portforward: true
+          portforward: false # Unblock Pipeline, broken for all windows scenarios
           hostport: true
           service: true
           hybridWin: true
diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
index 6780a82709..07d4a8cc67 100644
--- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
+++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -123,7 +123,7 @@ stages:
           dependsOn: cni_linux
           # dualstack: true # Currently broken for scenario and blocking releases, HNS is investigating. Covered by go test in E2E step template
           dns: true
-          portforward: true
+          portforward: false # Unblock Pipeline, broken for all windows scenarios
           # service: true  # Currently broken for scenario and blocking releases, HNS is investigating.
           hostport: true
           hybridWin: true