diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java
index 8f78ee1e..e2b56011 100644
--- a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java
+++ b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ConfigCredentialsProvider.java
@@ -6,8 +6,6 @@
 import jakarta.ws.rs.client.ClientRequestContext;
 
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Dependent
 @Alternative
@@ -19,48 +17,49 @@ public class ConfigCredentialsProvider implements CredentialsProvider {
     static final String BEARER_TOKEN = "bearer-token";
     static final String API_KEY = "api-key";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCredentialsProvider.class);
-
-    public ConfigCredentialsProvider() {
-
-    }
-
     @Override
-    public String getApiKey(ClientRequestContext requestContext, String openApiSpecId, String authName) {
-        final String key = ConfigProvider.getConfig()
-                .getOptionalValue(AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, openApiSpecId, authName),
-                        String.class)
-                .orElse("");
-        if (key.isEmpty()) {
-            LOGGER.warn("configured {} property (see application.properties) is empty. hint: configure it.",
-                    AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, openApiSpecId, authName));
-        }
-        return key;
+    public Optional<String> getApiKey(CredentialsContext input) {
+        return ConfigProvider.getConfig()
+                .getOptionalValue(
+                        AbstractAuthProvider.getCanonicalAuthConfigPropertyName(API_KEY, getConfigKey(input),
+                                input.getAuthName()),
+                        String.class);
+
     }
 
     @Override
     public String getBasicUsername(ClientRequestContext requestContext, String openApiSpecId, String authName) {
         return ConfigProvider.getConfig()
-                .getOptionalValue(AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, openApiSpecId, authName),
-                        String.class)
-                .orElse("");
+                .getOptionalValue(
+                        AbstractAuthProvider.getCanonicalAuthConfigPropertyName(USER_NAME, getConfigKey(input),
+                                input.getAuthName()),
+                        String.class);
     }
 
     @Override
     public String getBasicPassword(ClientRequestContext requestContext, String openApiSpecId, String authName) {
         return ConfigProvider.getConfig()
-                .getOptionalValue(AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, openApiSpecId, authName),
-                        String.class)
-                .orElse("");
+                .getOptionalValue(
+                        AbstractAuthProvider.getCanonicalAuthConfigPropertyName(PASSWORD, getConfigKey(input),
+                                input.getAuthName()),
+                        String.class);
     }
 
     @Override
     public String getBearerToken(ClientRequestContext requestContext, String openApiSpecId, String authName) {
         return ConfigProvider.getConfig()
                 .getOptionalValue(
-                        AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, openApiSpecId, authName),
-                        String.class)
-                .orElse("");
+                        AbstractAuthProvider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN, getConfigKey(input),
+                                input.getAuthName()),
+                        String.class);
+    }
+
+    protected String getConfigKey(CredentialsContext input) {
+        return input.getOpenApiSpecId();
     }
 
+    @Override
+    public Optional<String> getOauth2BearerToken(CredentialsContext input) {
+        return Optional.empty();
+    }
 }