diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
index 6392798ed3..fdc03a7e73 100644
--- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
+++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
@@ -2,6 +2,7 @@
 
 import com.netcracker.cloud.maas.client.api.kafka.KafkaMaaSClient;
 import com.netcracker.cloud.maas.client.impl.ApiUrlProvider;
+import com.netcracker.cloud.maas.client.impl.Env;
 import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion;
 import com.netcracker.cloud.maas.client.impl.http.HttpClient;
 import com.netcracker.cloud.maas.client.impl.kafka.KafkaMaaSClientImpl;
@@ -14,7 +15,6 @@
 import io.quarkus.arc.DefaultBean;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 
 @Singleton
@@ -22,12 +22,14 @@ public class MaasKafkaProdClientConfig {
 
     @Singleton
     @Produces
-    KafkaMaaSClient kafkaMaaSClient(MaasKafkaProps props, M2MManager m2mManager) {
-        HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue());
+    KafkaMaaSClient kafkaMaaSClient(M2MManager m2mManager) {
+        String maasApiUrl = Env.apiUrl();
+        HttpClient maasHttpClient = HttpClient.getMaasClient(() -> m2mManager.getToken().getTokenValue());
+        HttpClient m2mHttpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue());
         return new KafkaMaaSClientImpl(
-                httpClient,
-                () -> new TenantManagerConnectorImpl(httpClient),
-                new ApiUrlProvider(new ServerApiVersion(httpClient, props.maasAgentUrl), props.maasAgentUrl)
+                maasHttpClient,
+                () -> new TenantManagerConnectorImpl(m2mHttpClient),
+                new ApiUrlProvider(new ServerApiVersion(maasHttpClient, maasApiUrl), maasApiUrl)
         );
     }
 
diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
index c8de7b52db..a7820d7aaa 100644
--- a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
+++ b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
@@ -2,6 +2,7 @@
 
 import com.netcracker.cloud.maas.client.api.kafka.KafkaMaaSClient;
 import com.netcracker.cloud.maas.client.impl.ApiUrlProvider;
+import com.netcracker.cloud.maas.client.impl.Env;
 import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion;
 import com.netcracker.cloud.maas.client.impl.http.HttpClient;
 import com.netcracker.cloud.maas.client.impl.kafka.KafkaMaaSClientImpl;
@@ -13,7 +14,6 @@
 import com.netcracker.maas.declarative.kafka.client.impl.topic.provider.api.MaasKafkaTopicServiceProvider;
 import com.netcracker.maas.declarative.kafka.client.impl.topic.provider.impl.MaasKafkaTopicServiceProviderImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,9 +25,6 @@
 @ConditionalOnProperty(value = KAFKA_LOCAL_DEV_ENABLED, havingValue = "false", matchIfMissing = true)
 public class MaasKafkaProdClientConfig {
 
-    @Autowired
-    MaasKafkaProps props;
-
     @Bean
     HttpClient maasHttpClient(@Autowired M2MManager m2MManager) {
         return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue());
@@ -40,10 +37,11 @@ TenantManagerConnector tenantManagerConnector(@Autowired M2MManager m2MManager)
 
     @Bean
     KafkaMaaSClient kafkaMaaSClient(HttpClient client, TenantManagerConnector tenantManagerConnector) {
+        String maasApiUrl = Env.apiUrl();
         return new KafkaMaaSClientImpl(
                 client,
                 () -> tenantManagerConnector,
-                new ApiUrlProvider(new ServerApiVersion(client, props.maasAgentUrl), props.maasAgentUrl)
+                new ApiUrlProvider(new ServerApiVersion(client, maasApiUrl), maasApiUrl)
         );
     }