diff --git a/.github/workflows/jetbrains-integration-test.yml b/.github/workflows/jetbrains-integration-test.yml
index 170a195600d70b..1ad3d0c7bf3662 100644
--- a/.github/workflows/jetbrains-integration-test.yml
+++ b/.github/workflows/jetbrains-integration-test.yml
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.19"
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: "11"
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
index 6e86bb62459504..89451d4f66a4f1 100644
--- a/WORKSPACE.yaml
+++ b/WORKSPACE.yaml
@@ -13,15 +13,15 @@ defaultArgs:
   codeWebExtensionCommit: 3953e8160fffa97dd4a4509542b4bf7ff9b704cd
   xtermCommit: d547d4ff4590b66c3ea24342fc62e3afcf6b77bc
   noVerifyJBPlugin: false
-  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.3.3.tar.gz"
-  golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.3.3.tar.gz"
-  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.3.3.tar.gz"
-  phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.3.3.tar.gz"
-  rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.3.3.tar.gz"
-  webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.3.3.tar.gz"
+  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2025.1.tar.gz"
+  golandDownloadUrl: "https://download.jetbrains.com/go/goland-2025.1.tar.gz"
+  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-2025.1.tar.gz"
+  phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2025.1.tar.gz"
+  rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2025.1.tar.gz"
+  webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2025.1.tar.gz"
   riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz"
-  clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.3.3.tar.gz"
-  rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz"
+  clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2025.1.tar.gz"
+  rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2025.1.tar.gz"
   jbBackendVersion: "latest"
   dockerVersion: "27.5.1"
   dockerComposeVersion: "2.34.0-gitpod.1"
diff --git a/components/ide/jetbrains/backend-plugin/gradle-stable.properties b/components/ide/jetbrains/backend-plugin/gradle-stable.properties
index b9b7ee08b7b3ba..c6cc4112b1a9a3 100644
--- a/components/ide/jetbrains/backend-plugin/gradle-stable.properties
+++ b/components/ide/jetbrains/backend-plugin/gradle-stable.properties
@@ -2,10 +2,10 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # revert pluginSinceBuild if it's unnecessary
-pluginSinceBuild=243.21565
-pluginUntilBuild=243.*
+pluginSinceBuild=251.23774
+pluginUntilBuild=251.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2024.3
+pluginVerifierIdeVersions=2025.1
 # Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=243.23654-EAP-CANDIDATE-SNAPSHOT
+platformVersion=251.23774-EAP-CANDIDATE-SNAPSHOT
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodClientProjectSessionTracker.kt
similarity index 94%
rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt
rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodClientProjectSessionTracker.kt
index fffdc4b2005dcf..9221a5b639f27c 100644
--- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt
+++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodClientProjectSessionTracker.kt
@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 
-package io.gitpod.jetbrains.remote.latest
+package io.gitpod.jetbrains.remote.internal
 
 import com.intellij.codeWithMe.ClientId
 import com.intellij.openapi.client.ClientProjectSession
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt
deleted file mode 100644
index 914692daf7ea63..00000000000000
--- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
-// Licensed under the GNU Affero General Public License (AGPL).
-// See License.AGPL.txt in the project root for license information.
-
-package io.gitpod.jetbrains.remote.stable
-
-import com.intellij.openapi.client.ClientProjectSession
-import com.intellij.openapi.client.ClientSessionsManager
-import com.intellij.openapi.project.Project
-import io.gitpod.jetbrains.remote.AbstractGitpodClientProjectSessionTracker
-
-@Suppress("UnstableApiUsage")
-class GitpodClientProjectSessionTracker(val project: Project) : AbstractGitpodClientProjectSessionTracker(project) {
-    override val session: ClientProjectSession? = ClientSessionsManager.getProjectSession(project)
-}
diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml b/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml
index 4b6d818e497606..9d4b9661deb26b 100644
--- a/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml
+++ b/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml
@@ -6,7 +6,5 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
-        <projectService serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodClientProjectSessionTracker"
-                        client="controller" preload="true"/>
     </extensions>
 </idea-plugin>
diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml b/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml
index 87bf33c733e899..9d4b9661deb26b 100644
--- a/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml
+++ b/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml
@@ -6,7 +6,5 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
-        <projectService serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodClientProjectSessionTracker"
-                        client="controller" preload="true"/>
     </extensions>
 </idea-plugin>
diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml b/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml
index 7505ec6207d3ea..afe1d021a87338 100644
--- a/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml
+++ b/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml
@@ -34,6 +34,9 @@
         <projectService serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodTerminalServiceImpl" client="controller"
                         preload="true"/>
 
+        <projectService serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodClientProjectSessionTracker"
+                        client="controller" preload="true"/>
+
         <notificationGroup id="Gitpod Notifications" displayType="BALLOON" isLogByDefault="false"/>
 
         <httpRequestHandler implementation="io.gitpod.jetbrains.remote.GitpodCLIService"/>
@@ -47,7 +50,6 @@
                      description="Disable the forced update of Maven projects when IDE opens."
                      restartRequired="true"/>
 
-
         <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService"
                             serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodIgnoredPortsForNotificationServiceImpl"
                             preload="true"/>
diff --git a/components/ide/jetbrains/gateway-plugin/gradle-stable.properties b/components/ide/jetbrains/gateway-plugin/gradle-stable.properties
index e32c6054349243..0258fe22c02cc7 100644
--- a/components/ide/jetbrains/gateway-plugin/gradle-stable.properties
+++ b/components/ide/jetbrains/gateway-plugin/gradle-stable.properties
@@ -2,10 +2,10 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # revert pluginSinceBuild if it's unnecessary
-pluginSinceBuild=243.21565
-pluginUntilBuild=243.*
+pluginSinceBuild=251.23774
+pluginUntilBuild=251.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2024.3
+pluginVerifierIdeVersions=2025.1
 # Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/updates/updates.xml or exec `./gradlew printProductsReleases`
-platformVersion=2024.3
+platformVersion=2025.1
diff --git a/install/installer/pkg/components/ide-service/ide-configmap.json b/install/installer/pkg/components/ide-service/ide-configmap.json
index f7f3d396174422..865acb66be5900 100644
--- a/install/installer/pkg/components/ide-service/ide-configmap.json
+++ b/install/installer/pkg/components/ide-service/ide-configmap.json
@@ -246,6 +246,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/intellij:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.2",
             "image": "{{.Repository}}/ide/intellij:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -379,6 +387,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/goland:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.2",
             "image": "{{.Repository}}/ide/goland:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -505,6 +521,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/pycharm:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.1.1",
             "image": "{{.Repository}}/ide/pycharm:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -622,6 +646,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/phpstorm:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.2",
             "image": "{{.Repository}}/ide/phpstorm:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -739,6 +771,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/rubymine:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.1.1",
             "image": "{{.Repository}}/ide/rubymine:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -856,6 +896,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/webstorm:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.1.1",
             "image": "{{.Repository}}/ide/webstorm:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -1034,6 +1082,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.3",
+            "image": "{{.Repository}}/ide/clion:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.2",
             "image": "{{.Repository}}/ide/clion:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -1143,6 +1199,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.3.4",
+            "image": "{{.Repository}}/ide/rustrover:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
+              "{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
+            ]
+          },
           {
             "version": "2024.3.3",
             "image": "{{.Repository}}/ide/rustrover:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",