diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile
index 286f28619ba155..4b4d08160d581c 100644
--- a/.github/actions/delete-preview/Dockerfile
+++ b/.github/actions/delete-preview/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile
index 286f28619ba155..4b4d08160d581c 100644
--- a/.github/actions/deploy-gitpod/Dockerfile
+++ b/.github/actions/deploy-gitpod/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
 
 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 286f28619ba155..4b4d08160d581c 100644
--- a/.github/actions/deploy-monitoring-satellite/Dockerfile
+++ b/.github/actions/deploy-monitoring-satellite/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile
index 286f28619ba155..4b4d08160d581c 100644
--- a/.github/actions/preview-create/Dockerfile
+++ b/.github/actions/preview-create/Dockerfile
@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e98a2c138eb47f..a3d5c1f1ff74c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -118,7 +118,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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     steps:
       - uses: actions/checkout@v4
       - name: Setup Environment
@@ -188,7 +188,7 @@ jobs:
         ports:
           - 6379:6379
     container:
-      image: eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
       env:
         DB_HOST: "mysql"
         DB_PORT: "23306"
@@ -521,7 +521,7 @@ jobs:
       - create-runner
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     if: needs.configuration.outputs.with_integration_tests != '' && needs.configuration.outputs.is_scheduled_run != 'true'
     concurrency:
       group: ${{ needs.configuration.outputs.preview_name }}-integration-test
diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml
index c6da794a155019..c45c92ef8c36c0 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     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 d941864e794efe..4408be7a87b9e9 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
       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 b295d150aa1d0f..aad5c17e536bab 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     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 acdad1a74c063c..876c33501afc37 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     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 4f07d60c5aa96c..b33e21e065c8fc 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp
diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml
index e44d27512796fb..62561f93b3dbb7 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     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 be5e940415789d..09b7c314b545d4 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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     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-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
     steps:
       - uses: actions/checkout@v4
       - name: Integration Test
diff --git a/.gitpod.yml b/.gitpod.yml
index 213fb6127610ec..278a793d8b57bf 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-dev-artifact/dev/dev-environment:gpl-1425-int-test-gha.33103
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.33107
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports: