diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile
index fe8f5a6c1ed881..df28adb0ff863a 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.32357
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile
index fe8f5a6c1ed881..df28adb0ff863a 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.32357
 
 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..df28adb0ff863a 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.32357
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile
index fe8f5a6c1ed881..df28adb0ff863a 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.32357
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 318a2b689eede6..70e3b1cc8a5b9e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,7 +105,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.32357
     steps:
       - uses: actions/checkout@v4
       - name: Setup Environment
@@ -172,7 +172,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.32357
       env:
         DB_HOST: "mysql"
         DB_PORT: "23306"
@@ -318,7 +318,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.32357
     steps:
       - uses: actions/checkout@v4
       - name: Setup Environment
@@ -458,7 +458,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.32357
     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..b6b7ccd5931925 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.32357
     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 fb2d1afb457f15..8e0b2b26f7f648 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.32357
     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.32357
       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..2994b91926f41e 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.32357
     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 1ad3d0c7bf3662..0b74de6a70cf19 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.32357
     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..a1bc67bcccae28 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.32357
       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..db9024547f1182 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.32357
     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 ab5b10813cfbc2..d91de61933141b 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.32357
     outputs:
       name: ${{ steps.configuration.outputs.name }}
       version: ${{ steps.configuration.outputs.version }}
@@ -166,7 +166,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.32357
     steps:
       - uses: actions/checkout@v4
       - name: Integration Test
diff --git a/.gitpod.yml b/.gitpod.yml
index 9f1b04eebb44aa..cda3e9675bb53f 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.32357
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
diff --git a/components/supervisor/BUILD.yaml b/components/supervisor/BUILD.yaml
index 45807220c0aa8c..53ce99e0e2acb6 100644
--- a/components/supervisor/BUILD.yaml
+++ b/components/supervisor/BUILD.yaml
@@ -27,7 +27,7 @@ packages:
     deps:
       - :app
       - components/supervisor/frontend:app
-      - components/supervisor/openssh:app
+      - components/supervisor/openssh:docker-build
       - components/gitpod-cli:app
     argdeps:
       - imageRepoBase
diff --git a/components/supervisor/leeway.Dockerfile b/components/supervisor/leeway.Dockerfile
index d99ee60d300d02..ac75b707acebe6 100644
--- a/components/supervisor/leeway.Dockerfile
+++ b/components/supervisor/leeway.Dockerfile
@@ -28,9 +28,9 @@ COPY components-supervisor--app/supervisor \
      ./
 
 WORKDIR "/.supervisor/ssh"
-COPY components-supervisor-openssh--app/usr/sbin/sshd .
-COPY components-supervisor-openssh--app/usr/bin/ssh-keygen .
-COPY components-supervisor-openssh--app/usr/libexec/sshd-session .
+COPY components-supervisor-openssh--docker-build/content/content/usr/sbin/sshd .
+COPY components-supervisor-openssh--docker-build/content/content/usr/bin/ssh-keygen .
+COPY components-supervisor-openssh--docker-build/content/content/usr/libexec/sshd-session .
 
 COPY --from=docker_cli_builder /gp-docker/docker/docker /.supervisor/gitpod-docker-cli
 
diff --git a/components/supervisor/openssh/BUILD.yaml b/components/supervisor/openssh/BUILD.yaml
index 2dfb3a9596c1a4..c40427f0153908 100644
--- a/components/supervisor/openssh/BUILD.yaml
+++ b/components/supervisor/openssh/BUILD.yaml
@@ -1,12 +1,4 @@
 packages:
-  - name: app
-    type: generic
-    deps:
-      - :docker-build
-    config:
-      commands:
-        - ["sh", "-c","TARFILE=$(cat ./components-supervisor-openssh--docker-build/manifest.json | jq -r '.[].Layers[]') && tar xvf ./components-supervisor-openssh--docker-build/$TARFILE"]
-        - ["rm", "-rf", "components-supervisor-openssh--docker-build"]
   - name: docker-build
     type: docker
     config: