diff --git a/query-service-factory/build.gradle.kts b/query-service-factory/build.gradle.kts
index 0011452e..23b49ae9 100644
--- a/query-service-factory/build.gradle.kts
+++ b/query-service-factory/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
   api("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.78")
 
   implementation(project(":query-service-impl"))
-  implementation("com.google.inject:guice:5.0.1")
+  implementation("com.google.inject:guice:6.0.0")
 }
diff --git a/query-service-impl/build.gradle.kts b/query-service-impl/build.gradle.kts
index 2f5aa7ce..b04e5d40 100644
--- a/query-service-impl/build.gradle.kts
+++ b/query-service-impl/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
   implementation("org.hypertrace.core.attribute.service:attribute-service-api:0.14.26")
   implementation("org.hypertrace.core.attribute.service:attribute-projection-registry:0.14.26")
   implementation("org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.26")
-  implementation("com.google.inject:guice:5.0.1")
+  implementation("com.google.inject:guice:6.0.0")
   implementation("org.apache.pinot:pinot-java-client:0.12.1") {
     // We want to use log4j2 impl so exclude the log4j binding of slf4j
     exclude("org.slf4j", "slf4j-log4j12")
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/AttributeClientProvider.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/AttributeClientProvider.java
index 3c97c58d..bbf99c60 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/AttributeClientProvider.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/AttributeClientProvider.java
@@ -2,11 +2,11 @@
 
 import static org.hypertrace.core.grpcutils.client.RequestContextClientCallCredsProviderFactory.getClientCallCredsProvider;
 
+import com.google.inject.Provider;
 import io.grpc.Channel;
+import jakarta.inject.Inject;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
-import javax.inject.Inject;
-import javax.inject.Provider;
 import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
 import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry;
 
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceImpl.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceImpl.java
index 18653750..28364bc6 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceImpl.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceImpl.java
@@ -9,8 +9,8 @@
 import io.micrometer.core.instrument.Counter;
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Observable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.core.grpcutils.server.rx.ServerCallStreamRxObserver;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceModule.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceModule.java
index 0ce42234..e3878031 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceModule.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceModule.java
@@ -3,7 +3,7 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.multibindings.Multibinder;
 import com.typesafe.config.Config;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
 import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry;
 import org.hypertrace.core.query.service.api.QueryServiceGrpc.QueryServiceImplBase;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformationPipeline.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformationPipeline.java
index 797be9b4..e80149fe 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformationPipeline.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformationPipeline.java
@@ -2,8 +2,8 @@
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
+import jakarta.inject.Inject;
 import java.util.Set;
-import javax.inject.Inject;
 import org.hypertrace.core.query.service.QueryTransformation.QueryTransformationContext;
 import org.hypertrace.core.query.service.api.QueryRequest;
 
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerClientConfigRegistry.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerClientConfigRegistry.java
index cae74671..24f0a2b3 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerClientConfigRegistry.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerClientConfigRegistry.java
@@ -1,10 +1,10 @@
 package org.hypertrace.core.query.service;
 
+import jakarta.inject.Inject;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
 
 public class RequestHandlerClientConfigRegistry {
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerRegistry.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerRegistry.java
index 83b48e01..583c41e2 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerRegistry.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerRegistry.java
@@ -1,11 +1,11 @@
 package org.hypertrace.core.query.service;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
 
 @Singleton
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerSelector.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerSelector.java
index d7fbe8ba..d7066fee 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerSelector.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerSelector.java
@@ -1,7 +1,7 @@
 package org.hypertrace.core.query.service;
 
+import jakarta.inject.Inject;
 import java.util.Optional;
-import javax.inject.Inject;
 import org.hypertrace.core.query.service.api.QueryRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/multivalue/MultiValueTransformation.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/multivalue/MultiValueTransformation.java
index 64c9787f..db6d923d 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/multivalue/MultiValueTransformation.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/multivalue/MultiValueTransformation.java
@@ -2,8 +2,8 @@
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
+import jakarta.inject.Inject;
 import java.util.List;
-import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.hypertrace.core.query.service.AbstractQueryTransformation;
 import org.hypertrace.core.query.service.api.Expression;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotRequestHandlerBuilder.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotRequestHandlerBuilder.java
index c9e2a3ae..ef5304fd 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotRequestHandlerBuilder.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/pinot/PinotRequestHandlerBuilder.java
@@ -1,6 +1,6 @@
 package org.hypertrace.core.query.service.pinot;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
 import org.hypertrace.core.query.service.RequestHandler;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/postgres/PostgresRequestHandlerBuilder.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/postgres/PostgresRequestHandlerBuilder.java
index 82975b49..8896b6c7 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/postgres/PostgresRequestHandlerBuilder.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/postgres/PostgresRequestHandlerBuilder.java
@@ -1,7 +1,7 @@
 package org.hypertrace.core.query.service.postgres;
 
+import jakarta.inject.Inject;
 import java.sql.SQLException;
-import javax.inject.Inject;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
 import org.hypertrace.core.query.service.RequestHandler;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/projection/ProjectionTransformation.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/projection/ProjectionTransformation.java
index 1536dfe8..9a1f7a12 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/projection/ProjectionTransformation.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/projection/ProjectionTransformation.java
@@ -12,9 +12,9 @@
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.Optional;
-import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
 import org.hypertrace.core.attribute.service.projection.AttributeProjection;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/prometheus/PrometheusRequestHandlerBuilder.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/prometheus/PrometheusRequestHandlerBuilder.java
index acd0be7a..117af2b4 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/prometheus/PrometheusRequestHandlerBuilder.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/prometheus/PrometheusRequestHandlerBuilder.java
@@ -1,6 +1,6 @@
 package org.hypertrace.core.query.service.prometheus;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
 import org.hypertrace.core.query.service.RequestHandler;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoRequestHandlerBuilder.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoRequestHandlerBuilder.java
index 6d91af37..7dd5eede 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoRequestHandlerBuilder.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoRequestHandlerBuilder.java
@@ -1,7 +1,7 @@
 package org.hypertrace.core.query.service.trino;
 
+import jakarta.inject.Inject;
 import java.sql.SQLException;
-import javax.inject.Inject;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
 import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
 import org.hypertrace.core.query.service.RequestHandler;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/LimitValidation.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/LimitValidation.java
index 6ad8162e..c34b704c 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/LimitValidation.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/LimitValidation.java
@@ -2,7 +2,7 @@
 
 import io.grpc.Status;
 import io.reactivex.rxjava3.core.Completable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.core.query.service.QueryServiceConfig;
diff --git a/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/QueryValidator.java b/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/QueryValidator.java
index cea8f9aa..d1f6be3d 100644
--- a/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/QueryValidator.java
+++ b/query-service-impl/src/main/java/org/hypertrace/core/query/service/validation/QueryValidator.java
@@ -2,8 +2,8 @@
 
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Observable;
+import jakarta.inject.Inject;
 import java.util.Set;
-import javax.inject.Inject;
 import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.core.query.service.api.QueryRequest;