diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 763be33f18cff8..836a569c033401 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,15 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel>
+      <module name="jetbrains-backend-plugin" target="11" />
+      <module name="jetbrains-backend-plugin.gitpod-protocol" target="11" />
+      <module name="jetbrains-backend-plugin.gitpod-protocol.main" target="11" />
+      <module name="jetbrains-backend-plugin.gitpod-protocol.test" target="11" />
+      <module name="jetbrains-backend-plugin.main" target="11" />
+      <module name="jetbrains-backend-plugin.supervisor-api" target="11" />
+      <module name="jetbrains-backend-plugin.supervisor-api.main" target="11" />
+      <module name="jetbrains-backend-plugin.supervisor-api.test" target="11" />
+      <module name="jetbrains-backend-plugin.test" target="11" />
       <module name="jetbrains-gateway-gitpod-plugin" target="11" />
       <module name="jetbrains-gateway-gitpod-plugin.gitpod-protocol" target="11" />
       <module name="jetbrains-gateway-gitpod-plugin.gitpod-protocol.main" target="11" />
diff --git a/.idea/gitpod.iml b/.idea/gitpod.iml
index b7acd9441160bc..a35f756015d636 100644
--- a/.idea/gitpod.iml
+++ b/.idea/gitpod.iml
@@ -15,7 +15,7 @@
       <excludeFolder url="file://$MODULE_DIR$/components/supervisor-api/typescript-rest/lib" />
       <excludeFolder url="file://$MODULE_DIR$/components/content-service-api/typescript/lib" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 66d956e011c983..f66432ed4ba652 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/components/ide/jetbrains/backend-plugin" />
-        <option name="gradleJvm" value="11 (2)" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$/components/gitpod-protocol/java" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a59e9b05bab4ff..a619d74d54f5d6 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://cache-redirector.jetbrains.com/www.jetbrains.com/intellij-repository/snapshots" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 843fe416b6500a..bb4d3843b5c7f3 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,15 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/gitpod.iml" filepath="$PROJECT_DIR$/.idea/gitpod.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/jetbrains-backend-plugin.iml" filepath="$PROJECT_DIR$/.idea/modules/jetbrains-backend-plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1099510149/jetbrains-backend-plugin.gitpod-protocol.iml" filepath="$PROJECT_DIR$/.idea/modules/1099510149/jetbrains-backend-plugin.gitpod-protocol.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1099510149/jetbrains-backend-plugin.gitpod-protocol.main.iml" filepath="$PROJECT_DIR$/.idea/modules/1099510149/jetbrains-backend-plugin.gitpod-protocol.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1099510149/jetbrains-backend-plugin.gitpod-protocol.test.iml" filepath="$PROJECT_DIR$/.idea/modules/1099510149/jetbrains-backend-plugin.gitpod-protocol.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/jetbrains-backend-plugin.main.iml" filepath="$PROJECT_DIR$/.idea/modules/jetbrains-backend-plugin.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1017917334/jetbrains-backend-plugin.supervisor-api.iml" filepath="$PROJECT_DIR$/.idea/modules/1017917334/jetbrains-backend-plugin.supervisor-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1017917334/jetbrains-backend-plugin.supervisor-api.main.iml" filepath="$PROJECT_DIR$/.idea/modules/1017917334/jetbrains-backend-plugin.supervisor-api.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/1017917334/jetbrains-backend-plugin.supervisor-api.test.iml" filepath="$PROJECT_DIR$/.idea/modules/1017917334/jetbrains-backend-plugin.supervisor-api.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/jetbrains-backend-plugin.test.iml" filepath="$PROJECT_DIR$/.idea/modules/jetbrains-backend-plugin.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/components/ide/jetbrains/backend-plugin/gradle.properties b/components/ide/jetbrains/backend-plugin/gradle.properties
index 42fbf8c61900a2..807fa6476d756a 100644
--- a/components/ide/jetbrains/backend-plugin/gradle.properties
+++ b/components/ide/jetbrains/backend-plugin/gradle.properties
@@ -12,7 +12,7 @@ pluginUntilBuild=221.*
 pluginVerifierIdeVersions=2021.3, 2022.1
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType=IU
-platformVersion=221.4994-EAP-CANDIDATE-SNAPSHOT
+platformVersion=221-EAP-SNAPSHOT
 platformDownloadSources=true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodGatewayClientCustomizationProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodGatewayClientCustomizationProvider.kt
new file mode 100644
index 00000000000000..1b1ee9665f4f5f
--- /dev/null
+++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodGatewayClientCustomizationProvider.kt
@@ -0,0 +1,24 @@
+// Copyright (c) 2022 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
+
+import com.jetbrains.rdserver.unattendedHost.customization.GatewayClientCustomizationProvider
+import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.DefaultGatewayControlCenterProvider
+import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.GatewayControlCenterProvider
+import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.GatewayHostnameDisplayKind
+import io.gitpod.jetbrains.remote.icons.GitpodIcons
+import javax.swing.Icon
+
+class GitpodGatewayClientCustomizationProvider : GatewayClientCustomizationProvider {
+    override val icon: Icon = GitpodIcons.Logo
+    override val title: String = DefaultGatewayControlCenterProvider().getHostnameShort()
+
+    override val controlCenter: GatewayControlCenterProvider = object : GatewayControlCenterProvider {
+        override fun getHostnameDisplayKind() = GatewayHostnameDisplayKind.ShowHostnameOnNavbar
+        override fun getHostnameShort() = title
+        override fun getHostnameLong() = title
+    }
+}
+
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 e30a75b80f350e..96cf8c00b37a58 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
@@ -28,6 +28,7 @@
         <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodClientProjectSessionTracker" client="guest" preload="true"/>
         <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodTerminalService" preload="true"/>
         <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodProjectManager" preload="true"/>
+        <gateway.customization.name implementation="io.gitpod.jetbrains.remote.GitpodGatewayClientCustomizationProvider"/>
     </extensions>
 
 </idea-plugin>