diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCConfig.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCConfig.java
index 4aa81a36fe..4abbfc1eb5 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCConfig.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCConfig.java
@@ -22,6 +22,7 @@
 public class OIDCConfig {
 
     @Bean
+    @Qualifier("oidcJwtClock")
     public Clock clock() {
         return new DefaultClock();
     }
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCTokenProvider.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCTokenProvider.java
index c47704e33a..543fb49891 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCTokenProvider.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/token/OIDCTokenProvider.java
@@ -27,7 +27,6 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -80,15 +79,13 @@ public class OIDCTokenProvider implements OIDCProvider {
     @Value("${apiml.security.oidc.jwks.refreshInternalHours:1}")
     private int jwkRefreshInterval;
 
-    @Autowired
     @Qualifier("secureHttpClientWithoutKeystore")
     @NonNull
     private final CloseableHttpClient httpClient;
 
-    @Autowired
+    @Qualifier("oidcJwtClock")
     private final Clock clock;
 
-    @Autowired
     @Qualifier("oidcMapper")
     private final ObjectMapper mapper;