diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile
index fe8f5a6c1ed881..387edc96d504cf 100644
--- a/.github/actions/delete-preview/Dockerfile
+++ b/.github/actions/delete-preview/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile
index fe8f5a6c1ed881..387edc96d504cf 100644
--- a/.github/actions/deploy-gitpod/Dockerfile
+++ b/.github/actions/deploy-gitpod/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/deploy-monitoring-satellite/Dockerfile b/.github/actions/deploy-monitoring-satellite/Dockerfile
index fe8f5a6c1ed881..387edc96d504cf 100644
--- a/.github/actions/deploy-monitoring-satellite/Dockerfile
+++ b/.github/actions/deploy-monitoring-satellite/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile
index fe8f5a6c1ed881..387edc96d504cf 100644
--- a/.github/actions/preview-create/Dockerfile
+++ b/.github/actions/preview-create/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b4429077eaa2c1..e296fa626dbf0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,7 +104,7 @@ jobs:
       cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     steps:
       - uses: actions/checkout@v4
       - name: Setup Environment
@@ -171,7 +171,7 @@ jobs:
         ports:
           - 6379:6379
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
       env:
         DB_HOST: "mysql"
         DB_PORT: "23306"
@@ -210,7 +210,12 @@ jobs:
           RESULT=0
           set -x
 
+          wget -q https://8080--0195b910-1349-73b4-a24c-a0c5a2c48849.us01.gitpod.dev/leeway -O leeway
+          chmod +x leeway
+          export PATH=$PWD:$PATH
+
           leeway build dev:all \
+            --max-concurrent-tasks 8 \
             --docker-build-options network=host \
             --cache remote \
             -Dversion=$VERSION \
@@ -228,6 +233,18 @@ jobs:
 
           cat report.html >> $GITHUB_STEP_SUMMARY
 
+          SUMMARY_SIZE=$(wc -c < $GITHUB_STEP_SUMMARY)
+          if [[ $SUMMARY_SIZE -gt 1000000 ]]; then
+            head -c 1000000 $GITHUB_STEP_SUMMARY > $GITHUB_STEP_SUMMARY.tmp
+            mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
+            (
+              echo '.....'
+              echo ''
+              echo ':x: **WARNING: Summary is too large and has been truncated.**'
+              echo ''
+            )  >> $GITHUB_STEP_SUMMARY
+          fi
+
           exit $RESULT
       - name: Leeway Build
         id: leeway
@@ -259,6 +276,7 @@ jobs:
           [[ "$PR_NO_TEST"  = "true" ]] && TEST="--dont-test" || TEST=""
           [[ "${PUBLISH_TO_NPM}" = 'true' ]] && NPM_PUBLISH_TRIGGER=$(date +%s%3N) || NPM_PUBLISH_TRIGGER="false"
 
+
           RESULT=0
           set -x
           # CI=true is a var set by GHA. Unsetting it for the build, as yarn builds treat warnings as errors if that var is set to true
@@ -267,7 +285,7 @@ jobs:
             $TEST \
             -Dversion=$VERSION \
             --docker-build-options network=host \
-            --max-concurrent-tasks 1 \
+            --max-concurrent-tasks 8 \
             -DlocalAppVersion=$VERSION \
             -DpublishToNPM="${PUBLISH_TO_NPM}" \
             -DnpmPublishTrigger="${NPM_PUBLISH_TRIGGER}" \
@@ -425,7 +443,7 @@ jobs:
       - create-runner
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     if: needs.configuration.outputs.with_integration_tests != ''
     concurrency:
       group: ${{ needs.configuration.outputs.preview_name }}-integration-test
diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml
index e970040211ae67..f7743bfccc9526 100644
--- a/.github/workflows/code-nightly.yml
+++ b/.github/workflows/code-nightly.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-environment
diff --git a/.github/workflows/ide-integration-tests.yml b/.github/workflows/ide-integration-tests.yml
index 23c25817e8bcf7..8114e523c911ff 100644
--- a/.github/workflows/ide-integration-tests.yml
+++ b/.github/workflows/ide-integration-tests.yml
@@ -43,7 +43,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     outputs:
       name: ${{ steps.configuration.outputs.name }}
       version: ${{ steps.configuration.outputs.version }}
@@ -131,7 +131,7 @@ jobs:
     needs: [configuration, infrastructure, create-runner]
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp
diff --git a/.github/workflows/jetbrains-auto-update-template.yml b/.github/workflows/jetbrains-auto-update-template.yml
index 13311916785fc4..26bfcfd8244483 100644
--- a/.github/workflows/jetbrains-auto-update-template.yml
+++ b/.github/workflows/jetbrains-auto-update-template.yml
@@ -23,7 +23,7 @@ jobs:
   update-jetbrains:
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     needs: [ create-runner ]
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/jetbrains-integration-test.yml b/.github/workflows/jetbrains-integration-test.yml
index 170a195600d70b..6bee572bfd3f58 100644
--- a/.github/workflows/jetbrains-integration-test.yml
+++ b/.github/workflows/jetbrains-integration-test.yml
@@ -39,7 +39,7 @@ jobs:
       gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
   jetbrains-smoke-test-linux:
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     steps:
diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml
index dc52a347077cab..de2794265e7f63 100644
--- a/.github/workflows/preview-env-check-regressions.yml
+++ b/.github/workflows/preview-env-check-regressions.yml
@@ -99,7 +99,7 @@ jobs:
     if: ${{ needs.configuration.outputs.skip == 'false' }}
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp
diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml
index 87465d51caa77e..0a145d72df3fb4 100644
--- a/.github/workflows/preview-env-gc.yml
+++ b/.github/workflows/preview-env-gc.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     outputs:
       names: ${{ steps.set-matrix.outputs.names }}
       count: ${{ steps.set-matrix.outputs.count }}
diff --git a/.github/workflows/workspace-integration-tests.yml b/.github/workflows/workspace-integration-tests.yml
index 00a4a88fae779a..8acda2ee082257 100644
--- a/.github/workflows/workspace-integration-tests.yml
+++ b/.github/workflows/workspace-integration-tests.yml
@@ -61,7 +61,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     outputs:
       name: ${{ steps.configuration.outputs.name }}
       version: ${{ steps.configuration.outputs.version }}
@@ -162,7 +162,7 @@ jobs:
     needs: [configuration, infrastructure, create-runner]
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
     steps:
       - uses: actions/checkout@v4
       - name: Integration Test
diff --git a/.gitpod.yml b/.gitpod.yml
index 9f1b04eebb44aa..ce2c2e6fa51d89 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.31886
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
diff --git a/components/BUILD.yaml b/components/BUILD.yaml
index d847b05a7cd52f..cee9a8824bf033 100644
--- a/components/BUILD.yaml
+++ b/components/BUILD.yaml
@@ -8,12 +8,12 @@ packages:
     argdeps:
       - version
     deps:
-      - :all-docker
       - :docker-versions
       - :publish-api
+      - components/gitpod-protocol:all
       - dev:all-app
       - install/installer:docker
-      - components/gitpod-protocol:all
+      - :all-docker
   - name: docker-versions
     type: docker
     config: