diff --git a/pom.xml b/pom.xml
index 9f70e0de84..9659f04ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
         <com.google.code.guice.version>5.0.1</com.google.code.guice.version>
         <com.google.errorprone>2.3.4</com.google.errorprone>
         <com.google.guava.version>32.1.2-jre</com.google.guava.version>
-        <com.google.http-client.version>1.43.3</com.google.http-client.version>
+        <com.google.http-client.version>2.0.2</com.google.http-client.version>
         <com.google.oauth-client.version>1.34.1</com.google.oauth-client.version>
         <com.googlecode.gson.version>2.10.1</com.googlecode.gson.version>
         <com.h2database.version>2.2.224</com.h2database.version>
@@ -64,6 +64,7 @@
         <commons-io.version>2.14.0</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
         <enforcer.skip>false</enforcer.skip>
+        <grpc-context.version>1.77.0</grpc-context.version>
         <integration.mysql.db.image>quay.io/eclipse/che--centos--mysql-57-centos7:latest-e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764</integration.mysql.db.image>
         <integration.postgresql.db.image>quay.io/eclipse/che--centos--postgresql-13-centos7:1-71b24684d64da46f960682cc4216222a7e4ed8b1a31dd5a865b3e71afdea20d2</integration.postgresql.db.image>
         <io.fabric8.kubernetes-client.version>7.4.0</io.fabric8.kubernetes-client.version>
@@ -203,6 +204,10 @@
                         <artifactId>jsr305</artifactId>
                         <groupId>com.google.code.findbugs</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>error_prone_annotations</artifactId>
+                        <groupId>com.google.errorprone</groupId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -218,6 +223,14 @@
                         <artifactId>jsr305</artifactId>
                         <groupId>com.google.code.findbugs</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>j2objc-annotations</artifactId>
+                        <groupId>com.google.j2objc</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>grpc-context</artifactId>
+                        <groupId>io.grpc</groupId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -1450,6 +1463,12 @@
                 <version>${com.github.kirviq.dumbster.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-context</artifactId>
+                <version>${grpc-context.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/wsmaster/che-core-api-auth/pom.xml b/wsmaster/che-core-api-auth/pom.xml
index 0442ceda18..c614fa3846 100644
--- a/wsmaster/che-core-api-auth/pom.xml
+++ b/wsmaster/che-core-api-auth/pom.xml
@@ -109,6 +109,11 @@
             <artifactId>commons-fileupload</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-context</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>