diff --git a/pom.xml b/pom.xml
index b2daef2..e880901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
     <properties>
         <java.version>8</java.version>
-        <tosan.httpclient.version>2.0.1</tosan.httpclient.version>
+        <tosan.httpclient.version>2.1.3</tosan.httpclient.version>
         <camunda.version>7.17.0</camunda.version>
         <swagger-annotations.version>2.1.13</swagger-annotations.version>
     </properties>
diff --git a/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaEngineClientConfig.java b/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaEngineClientConfig.java
index c23134a..487b458 100644
--- a/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaEngineClientConfig.java
+++ b/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaEngineClientConfig.java
@@ -18,6 +18,10 @@
 import com.tosan.client.http.starter.impl.feign.CustomErrorDecoder;
 import com.tosan.client.http.starter.impl.feign.CustomErrorDecoderConfig;
 import com.tosan.client.http.starter.impl.feign.ExceptionExtractType;
+import com.tosan.tools.mask.starter.config.SecureParametersConfig;
+import com.tosan.tools.mask.starter.replace.JacksonReplaceHelper;
+import com.tosan.tools.mask.starter.replace.JsonReplaceHelperDecider;
+import com.tosan.tools.mask.starter.replace.RegexReplaceHelper;
 import feign.*;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
@@ -30,9 +34,13 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignFormatterRegistrar;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 
@@ -69,6 +77,26 @@ public ObjectMapper camundaClientObjectMapper() {
         return objectMapper;
     }
 
+    @Bean("camunda-client-replace-helper")
+    public JsonReplaceHelperDecider replaceHelperDecider(JacksonReplaceHelper jacksonReplaceHelper,
+                                                         RegexReplaceHelper regexReplaceHelper,
+                                                         @Qualifier("camunda-client-secured-parameters")
+                                                         SecureParametersConfig secureParametersConfig) {
+        return super.replaceHelperDecider(jacksonReplaceHelper, regexReplaceHelper, secureParametersConfig);
+    }
+
+    @Bean("camunda-client-httpFeignClientLogger")
+    public Logger httpFeignClientLogger(@Qualifier("camunda-client-replace-helper")
+                                        JsonReplaceHelperDecider replaceHelperDecider) {
+        return super.httpFeignClientLogger(replaceHelperDecider, "camunda-client");
+    }
+
+    @Bean("camunda-client-secured-parameters")
+    @ConditionalOnMissingBean(name = "camunda-client-secured-parameters")
+    public SecureParametersConfig secureParametersConfig() {
+        return super.secureParametersConfig();
+    }
+
     @Bean
     @ConfigurationProperties(prefix = "camunda.bpm.client")
     @Primary
@@ -142,8 +170,15 @@ public List<RequestInterceptor> requestInterceptors(
 
     @Override
     @Bean("camunda-client-feignContract")
-    public Contract feignContract() {
-        return new SpringMvcContractImpl();
+    public Contract feignContractWithCustomSpringConversion(
+            @Qualifier("camunda-client-feignConversionService") ConversionService feignConversionService,
+            List<AnnotatedParameterProcessor> processors) {
+        return new SpringMvcContractImpl(feignConversionService, processors);
+    }
+
+    @Bean("camunda-client-feignConversionService")
+    public FormattingConversionService feignConversionService(List<FeignFormatterRegistrar> feignFormatterRegistrars) {
+        return super.feignConversionService(feignFormatterRegistrars);
     }
 
     @Override
@@ -161,7 +196,7 @@ public Decoder feignDecoder(@Qualifier("camunda-client-jacksonHttpMessageConvert
     @Override
     @Bean("camunda-client-jacksonHttpMessageConverter")
     public HttpMessageConverter<Object> httpMessageConverter(@Qualifier("camunda-client-objectMapper")
-                                                                     ObjectMapper objectMapper) {
+                                                             ObjectMapper objectMapper) {
         return super.httpMessageConverter(objectMapper);
     }
 
diff --git a/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaServiceConfig.java b/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaServiceConfig.java
index 2ca96a9..46fdb3a 100644
--- a/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaServiceConfig.java
+++ b/tosan-camunda-client-spring-boot-starter/src/main/java/com/tosan/camunda/camundaclient/CamundaServiceConfig.java
@@ -22,819 +22,376 @@
 @EnableFeignClients
 public class CamundaServiceConfig extends CamundaEngineClientConfig {
 
+    @Override
+    @Bean("camunda-client-feignBuilder")
+    public Feign.Builder feignBuilder(@Qualifier("camunda-client-feignClient") Client feignClient,
+                                      @Qualifier("camunda-client-feignOption") Request.Options options,
+                                      @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
+                                      @Qualifier("camunda-client-feignContract") Contract feignContract,
+                                      @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
+                                      @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
+                                      @Qualifier("camunda-client-retryer") Retryer retryer,
+                                      @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
+                                      @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder,
+                                      @Qualifier("camunda-client-httpFeignClientLogger") Logger logger) {
+        return super.feignBuilder(feignClient, options, requestInterceptors, feignContract, feignDecoder, feignEncoder,
+                retryer, logLevel, errorDecoder, logger);
+    }
+
     @Bean
     public MessageApi messageServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                           @Qualifier("camunda-client-feignClient") Client feignClient,
-                                           @Qualifier("camunda-client-feignOption") Request.Options options,
-                                           @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                           @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                           @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                           @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                           @Qualifier("camunda-client-retryer") Retryer retryer,
-                                           @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                           @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                MessageApi.class, new Slf4jLogger(MessageApi.class));
+                                           @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                MessageApi.class);
     }
 
     @Bean
     public DeploymentApi deploymentServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                 @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                 @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                 @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                 @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                 @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                 @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                 @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                 @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                 @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                DeploymentApi.class, new Slf4jLogger(DeploymentApi.class));
+                                                 @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                DeploymentApi.class);
     }
 
     @Bean
     public ExecutionApi executionServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                               @Qualifier("camunda-client-feignClient") Client feignClient,
-                                               @Qualifier("camunda-client-feignOption") Request.Options options,
-                                               @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                               @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                               @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                               @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                               @Qualifier("camunda-client-retryer") Retryer retryer,
-                                               @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                               @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                ExecutionApi.class, new Slf4jLogger(ExecutionApi.class));
+                                               @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                ExecutionApi.class);
     }
 
     @Bean
     public ExternalTaskApi externalTaskServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                     @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                     @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                     @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                     @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                     @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                     @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                     @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                     @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                     @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                ExternalTaskApi.class, new Slf4jLogger(ExternalTaskApi.class));
+                                                     @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                ExternalTaskApi.class);
     }
 
     @Bean
     public HistoricActivityInstanceApi historicActivityInstanceTaskServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                 @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                 @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                 @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                 @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                 @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                 @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                 @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                 @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                 @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricActivityInstanceApi.class, new Slf4jLogger(HistoricActivityInstanceApi.class));
+                                                                                 @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricActivityInstanceApi.class);
     }
 
     @Bean
     public HistoricDetailApi historicDetailTaskServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                             @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                             @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                             @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                             @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                             @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                             @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                             @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                             @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                             @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricDetailApi.class, new Slf4jLogger(HistoricDetailApi.class));
+                                                             @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricDetailApi.class);
     }
 
     @Bean
     public HistoricExternalTaskLogApi historicExternalTaskLogServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                           @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                           @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                           @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                           @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                           @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                           @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                           @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                           @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                           @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricExternalTaskLogApi.class, new Slf4jLogger(HistoricExternalTaskLogApi.class));
+                                                                           @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricExternalTaskLogApi.class);
     }
 
     @Bean
     public HistoricIncidentApi historicIncidentServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                             @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                             @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                             @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                             @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                             @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                             @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                             @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                             @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                             @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricIncidentApi.class, new Slf4jLogger(HistoricIncidentApi.class));
+                                                             @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricIncidentApi.class);
     }
 
     @Bean
     public HistoricProcessInstanceApi historicProcessInstanceServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                           @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                           @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                           @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                           @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                           @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                           @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                           @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                           @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                           @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricProcessInstanceApi.class, new Slf4jLogger(HistoricProcessInstanceApi.class));
+                                                                           @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricProcessInstanceApi.class);
     }
 
     @Bean
     public IncidentApi incidentServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                             @Qualifier("camunda-client-feignClient") Client feignClient,
-                                             @Qualifier("camunda-client-feignOption") Request.Options options,
-                                             @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                             @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                             @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                             @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                             @Qualifier("camunda-client-retryer") Retryer retryer,
-                                             @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                             @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                IncidentApi.class, new Slf4jLogger(IncidentApi.class));
+                                             @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                IncidentApi.class);
     }
 
     @Bean
     public MetricsApi metricsServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                           @Qualifier("camunda-client-feignClient") Client feignClient,
-                                           @Qualifier("camunda-client-feignOption") Request.Options options,
-                                           @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                           @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                           @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                           @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                           @Qualifier("camunda-client-retryer") Retryer retryer,
-                                           @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                           @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                MetricsApi.class, new Slf4jLogger(MetricsApi.class));
+                                           @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                MetricsApi.class);
     }
 
     @Bean
     public MigrationApi migrationServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                               @Qualifier("camunda-client-feignClient") Client feignClient,
-                                               @Qualifier("camunda-client-feignOption") Request.Options options,
-                                               @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                               @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                               @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                               @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                               @Qualifier("camunda-client-retryer") Retryer retryer,
-                                               @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                               @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                MigrationApi.class, new Slf4jLogger(MigrationApi.class));
+                                               @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                MigrationApi.class);
     }
 
     @Bean
     public ProcessDefinitionApi processDefinitionServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                               @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                               @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                               @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                               @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                               @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                               @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                               @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                               @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                               @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                ProcessDefinitionApi.class, new Slf4jLogger(ProcessDefinitionApi.class));
+                                                               @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                ProcessDefinitionApi.class);
     }
 
     @Bean
     public ProcessInstanceApi processInstanceServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                           @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                           @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                           @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                           @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                           @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                           @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                           @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                           @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                           @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                ProcessInstanceApi.class, new Slf4jLogger(ProcessInstanceApi.class));
+                                                           @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                ProcessInstanceApi.class);
     }
 
     @Bean
     public VariableInstanceApi variableInstanceServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                             @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                             @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                             @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                             @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                             @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                             @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                             @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                             @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                             @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                VariableInstanceApi.class, new Slf4jLogger(VariableInstanceApi.class));
+                                                             @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                VariableInstanceApi.class);
     }
 
     @Bean
     public AuthorizationApi authorizeApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                      @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                      @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                      @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                      @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                      @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                      @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                      @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                      @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                      @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                AuthorizationApi.class, new Slf4jLogger(AuthorizationApi.class));
+                                                      @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                AuthorizationApi.class);
     }
 
     @Bean
     public BatchApi batchApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                          @Qualifier("camunda-client-feignClient") Client feignClient,
-                                          @Qualifier("camunda-client-feignOption") Request.Options options,
-                                          @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                          @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                          @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                          @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                          @Qualifier("camunda-client-retryer") Retryer retryer,
-                                          @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                          @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                BatchApi.class, new Slf4jLogger(BatchApi.class));
+                                          @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                BatchApi.class);
     }
 
     @Bean
     public ConditionApi conditionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                  @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                  @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                  @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                  @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                  @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                  @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                  @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                  @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                  @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                ConditionApi.class, new Slf4jLogger(ConditionApi.class));
+                                                  @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                ConditionApi.class);
     }
 
     @Bean
     public DecisionDefinitionApi decisionDefinitionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                    @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                    @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                    @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                    @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                    @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                    @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                    @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                    @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                    @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                DecisionDefinitionApi.class, new Slf4jLogger(DecisionDefinitionApi.class));
+                                                                    @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                DecisionDefinitionApi.class);
     }
 
     @Bean
     public DecisionRequirementsDefinitionApi decisionRequirementsDefinitionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                DecisionRequirementsDefinitionApi.class, new Slf4jLogger(DecisionRequirementsDefinitionApi.class));
+                                                                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                DecisionRequirementsDefinitionApi.class);
     }
 
     @Bean
     public EngineApi engineApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                EngineApi.class, new Slf4jLogger(EngineApi.class));
+                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                EngineApi.class);
     }
 
     @Bean
     public EventSubscriptionApi eventSubscriptionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                  @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                  @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                  @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                  @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                  @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                  @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                  @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                  @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                  @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                EventSubscriptionApi.class, new Slf4jLogger(EventSubscriptionApi.class));
+                                                                  @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                EventSubscriptionApi.class);
     }
 
     @Bean
     public FilterApi filterApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                FilterApi.class, new Slf4jLogger(FilterApi.class));
+                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                FilterApi.class);
     }
 
     @Bean
     public GroupApi groupApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                          @Qualifier("camunda-client-feignClient") Client feignClient,
-                                          @Qualifier("camunda-client-feignOption") Request.Options options,
-                                          @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                          @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                          @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                          @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                          @Qualifier("camunda-client-retryer") Retryer retryer,
-                                          @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                          @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                GroupApi.class, new Slf4jLogger(GroupApi.class));
+                                          @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                GroupApi.class);
     }
 
     @Bean
     public HistoricBatchApi historicBatchApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                          @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                          @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                          @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                          @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                          @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                          @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                          @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                          @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                          @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricBatchApi.class, new Slf4jLogger(HistoricBatchApi.class));
+                                                          @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricBatchApi.class);
     }
 
     @Bean
     public HistoricDecisionDefinitionApi historicDecisionDefinitionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                    @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                    @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                    @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                    @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                    @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                    @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                    @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                    @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                    @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricDecisionDefinitionApi.class, new Slf4jLogger(HistoricDecisionDefinitionApi.class));
+                                                                                    @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricDecisionDefinitionApi.class);
     }
 
     @Bean
     public HistoricDecisionInstanceApi historicDecisionInstanceApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricDecisionInstanceApi.class, new Slf4jLogger(HistoricDecisionInstanceApi.class));
+                                                                                @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricDecisionInstanceApi.class);
     }
 
     @Bean
     public HistoricDecisionRequirementsDefinitionApi historicDecisionRequirementsDefinitionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricDecisionRequirementsDefinitionApi.class, new Slf4jLogger(HistoricDecisionRequirementsDefinitionApi.class));
+                                                                                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricDecisionRequirementsDefinitionApi.class);
     }
 
     @Bean
     public HistoricIdentityLinkLogApi historicIdentityLinkLogApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                              @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                              @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                              @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                              @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                              @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                              @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                              @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                              @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                              @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricIdentityLinkLogApi.class, new Slf4jLogger(HistoricIdentityLinkLogApi.class));
+                                                                              @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricIdentityLinkLogApi.class);
     }
 
     @Bean
     public HistoricJobLogApi historicJobLogApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricJobLogApi.class, new Slf4jLogger(HistoricJobLogApi.class));
+                                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricJobLogApi.class);
     }
 
     @Bean
     public HistoricProcessDefinitionApi historicProcessDefinitionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                  @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                  @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                  @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                  @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                  @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                  @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                  @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                  @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                  @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricProcessDefinitionApi.class, new Slf4jLogger(HistoricProcessDefinitionApi.class));
+                                                                                  @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricProcessDefinitionApi.class);
     }
 
     @Bean
     public HistoricTaskInstanceApi historicTaskInstanceApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                        @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                        @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                        @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                        @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                        @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                        @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                        @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                        @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                        @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricTaskInstanceApi.class, new Slf4jLogger(HistoricTaskInstanceApi.class));
+                                                                        @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricTaskInstanceApi.class);
     }
 
     @Bean
     public HistoricUserOperationLogApi historicUserOperationLogApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricUserOperationLogApi.class, new Slf4jLogger(HistoricUserOperationLogApi.class));
+                                                                                @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricUserOperationLogApi.class);
     }
 
     @Bean
     public HistoricVariableInstanceApi historicVariableInstanceApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                                @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                                @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                                @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                                @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                                @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                                @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                                @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                                @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                                @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoricVariableInstanceApi.class, new Slf4jLogger(HistoricVariableInstanceApi.class));
+                                                                                @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoricVariableInstanceApi.class);
     }
 
     @Bean
     public HistoryCleanupApi historyCleanupApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                HistoryCleanupApi.class, new Slf4jLogger(HistoryCleanupApi.class));
+                                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                HistoryCleanupApi.class);
     }
 
     @Bean
     public IdentityApi identityApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                IdentityApi.class, new Slf4jLogger(IdentityApi.class));
+                                                @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                IdentityApi.class);
     }
 
     @Bean
     public JobApi jobApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                      @Qualifier("camunda-client-feignClient") Client feignClient,
-                                      @Qualifier("camunda-client-feignOption") Request.Options options,
-                                      @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                      @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                      @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                      @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                      @Qualifier("camunda-client-retryer") Retryer retryer,
-                                      @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                      @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                JobApi.class, new Slf4jLogger(JobApi.class));
+                                      @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                JobApi.class);
     }
 
     @Bean
     public JobDefinitionApi jobDefinitionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                          @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                          @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                          @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                          @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                          @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                          @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                          @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                          @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                          @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                JobDefinitionApi.class, new Slf4jLogger(JobDefinitionApi.class));
+                                                          @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                JobDefinitionApi.class);
     }
 
     @Bean
     public ModificationApi modificationApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                        @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                        @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                        @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                        @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                        @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                        @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                        @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                        @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                        @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                ModificationApi.class, new Slf4jLogger(ModificationApi.class));
+                                                        @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                ModificationApi.class);
     }
 
     @Bean
     public SchemaLogApi schemaLogApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                  @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                  @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                  @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                  @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                  @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                  @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                  @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                  @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                  @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                SchemaLogApi.class, new Slf4jLogger(SchemaLogApi.class));
+                                                  @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                SchemaLogApi.class);
     }
 
     @Bean
     public SignalApi signalApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                SignalApi.class, new Slf4jLogger(SignalApi.class));
+                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                SignalApi.class);
     }
 
     @Bean
     public TaskApi taskApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                        @Qualifier("camunda-client-feignClient") Client feignClient,
-                                        @Qualifier("camunda-client-feignOption") Request.Options options,
-                                        @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                        @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                        @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                        @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                        @Qualifier("camunda-client-retryer") Retryer retryer,
-                                        @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                        @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TaskApi.class, new Slf4jLogger(TaskApi.class));
+                                        @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TaskApi.class);
     }
 
     @Bean
     public TaskAttachmentApi taskAttachmentApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TaskAttachmentApi.class, new Slf4jLogger(TaskAttachmentApi.class));
+                                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TaskAttachmentApi.class);
     }
 
     @Bean
     public TaskCommentApi taskCommentApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                      @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                      @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                      @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                      @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                      @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                      @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                      @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                      @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                      @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TaskCommentApi.class, new Slf4jLogger(TaskCommentApi.class));
+                                                      @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TaskCommentApi.class);
     }
 
     @Bean
     public TaskIdentityLinkApi taskIdentityLinkApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TaskIdentityLinkApi.class, new Slf4jLogger(TaskIdentityLinkApi.class));
+                                                                @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TaskIdentityLinkApi.class);
     }
 
     @Bean
     public TaskLocalVariableApi taskLocalVariableApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                                  @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                                  @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                                  @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                                  @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                                  @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                                  @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                                  @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                                  @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                                  @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TaskLocalVariableApi.class, new Slf4jLogger(TaskLocalVariableApi.class));
+                                                                  @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TaskLocalVariableApi.class);
     }
 
     @Bean
     public TaskVariableApi taskVariableApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                        @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                        @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                        @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                        @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                        @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                        @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                        @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                        @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                        @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TaskVariableApi.class, new Slf4jLogger(TaskVariableApi.class));
+                                                        @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TaskVariableApi.class);
     }
 
     @Bean
     public TelemetryApi telemetryApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                                  @Qualifier("camunda-client-feignClient") Client feignClient,
-                                                  @Qualifier("camunda-client-feignOption") Request.Options options,
-                                                  @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                                  @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                                  @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                                  @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                                  @Qualifier("camunda-client-retryer") Retryer retryer,
-                                                  @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                                  @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TelemetryApi.class, new Slf4jLogger(TelemetryApi.class));
+                                                  @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TelemetryApi.class);
     }
 
     @Bean
     public TenantApi tenantApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                            @Qualifier("camunda-client-feignClient") Client feignClient,
-                                            @Qualifier("camunda-client-feignOption") Request.Options options,
-                                            @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                            @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                            @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                            @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                            @Qualifier("camunda-client-retryer") Retryer retryer,
-                                            @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                            @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                TenantApi.class, new Slf4jLogger(TenantApi.class));
+                                            @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                TenantApi.class);
     }
 
     @Bean
     public UserApi userApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                        @Qualifier("camunda-client-feignClient") Client feignClient,
-                                        @Qualifier("camunda-client-feignOption") Request.Options options,
-                                        @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                        @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                        @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                        @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                        @Qualifier("camunda-client-retryer") Retryer retryer,
-                                        @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                        @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                UserApi.class, new Slf4jLogger(UserApi.class));
+                                        @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                UserApi.class);
     }
 
     @Bean
     public VersionApi versionApiServiceClient(@Qualifier("camunda-client-clientConfig") HttpClientProperties camundaFeignConfig,
-                                              @Qualifier("camunda-client-feignClient") Client feignClient,
-                                              @Qualifier("camunda-client-feignOption") Request.Options options,
-                                              @Qualifier("camunda-client-requestInterceptor") List<RequestInterceptor> requestInterceptors,
-                                              @Qualifier("camunda-client-feignContract") Contract feignContract,
-                                              @Qualifier("camunda-client-feignDecoder") Decoder feignDecoder,
-                                              @Qualifier("camunda-client-feignEncoder") Encoder feignEncoder,
-                                              @Qualifier("camunda-client-retryer") Retryer retryer,
-                                              @Qualifier("camunda-client-feignLoggerLevel") Logger.Level logLevel,
-                                              @Qualifier("camunda-client-feignErrorDecoder") CustomErrorDecoder errorDecoder) {
-        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), super.feignBuilder(feignClient, options,
-                        requestInterceptors, feignContract, feignDecoder, feignEncoder, retryer, logLevel, errorDecoder),
-                VersionApi.class, new Slf4jLogger(VersionApi.class));
+                                              @Qualifier("camunda-client-feignBuilder") Feign.Builder feignBuilder) {
+        return super.getFeignController(camundaFeignConfig.getBaseServiceUrl(), feignBuilder,
+                VersionApi.class);
     }
 }
diff --git a/tosan-camunda-client-spring-boot-starter/src/main/java/feign/SpringMvcContractImpl.java b/tosan-camunda-client-spring-boot-starter/src/main/java/feign/SpringMvcContractImpl.java
index 0c3548a..6fac975 100644
--- a/tosan-camunda-client-spring-boot-starter/src/main/java/feign/SpringMvcContractImpl.java
+++ b/tosan-camunda-client-spring-boot-starter/src/main/java/feign/SpringMvcContractImpl.java
@@ -1,9 +1,12 @@
 package feign;
 
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
+import org.springframework.core.convert.ConversionService;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -17,6 +20,10 @@ public class SpringMvcContractImpl extends SpringMvcContract {
         add("getRequest");
     }};
 
+    public SpringMvcContractImpl(ConversionService feignConversionService, List<AnnotatedParameterProcessor> processors) {
+        super(processors, feignConversionService);
+    }
+
     @Override
     public MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
         if (ignoredMethodNames.contains(method.getName())) {