diff --git a/functionaltest-jenkins-plugin/build.gradle b/functionaltest-jenkins-plugin/build.gradle
index 39758b02..b908cc0a 100644
--- a/functionaltest-jenkins-plugin/build.gradle
+++ b/functionaltest-jenkins-plugin/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'groovy'
     id 'java'
     id "codenarc"
-    id "org.openapi.generator" version "7.11.0"
 }
 
 group 'functional-automation'
@@ -30,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jenkins-ci.plugins:stackrox-container-image-scanner:1.4.1'
+    implementation 'org.jenkins-ci.plugins:stackrox-container-image-scanner:1.4.2'
     implementation 'org.codehaus.groovy:groovy-all:3.0.8'
     implementation 'org.spockframework:spock-core:2.0-groovy-3.0'
     implementation 'com.offbytwo.jenkins:jenkins-client:0.3.8'
diff --git a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy
index f6daf6a0..c7e8b1df 100644
--- a/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy
+++ b/functionaltest-jenkins-plugin/src/main/groovy/RestApiClient.groovy
@@ -1,12 +1,12 @@
-import static com.stackrox.jenkins.plugins.services.ApiClientFactory.StackRoxTlsValidationMode.INSECURE_ACCEPT_ANY
+import java.time.Duration
 
 import groovy.transform.CompileStatic
+import okhttp3.OkHttpClient
 
 import com.stackrox.api.ApiTokenServiceApi
 import com.stackrox.api.MetadataServiceApi
 import com.stackrox.api.PolicyServiceApi
 import com.stackrox.invoker.ApiClient
-import com.stackrox.jenkins.plugins.services.ApiClientFactory
 import com.stackrox.model.StorageListPolicy
 import com.stackrox.model.StoragePolicy
 import com.stackrox.model.V1GenerateTokenRequest
@@ -16,16 +16,24 @@ import util.Config
 
 @CompileStatic
 class RestApiClient {
+    private static final Duration TIMEOUT = Duration.ofSeconds(30)
 
     PolicyServiceApi policyServiceApi
     MetadataServiceApi metadataApi
     ApiTokenServiceApi tokenApi
 
     RestApiClient() {
-        ApiClient apiClient = ApiClientFactory.newApiClient(Config.roxEndpoint, "", "", INSECURE_ACCEPT_ANY)
+        OkHttpClient client = OkHttpClient.Builder.newInstance()
+                .retryOnConnectionFailure(true)
+                .connectTimeout(TIMEOUT)
+                .readTimeout(TIMEOUT)
+                .writeTimeout(TIMEOUT)
+                .build()
+        ApiClient apiClient = new ApiClient(client)
         apiClient.setBearerToken(null as String)
         apiClient.setUsername("admin")
         apiClient.setPassword(Config.roxPassword)
+        apiClient.setBasePath(Config.roxEndpoint)
 
         policyServiceApi = new PolicyServiceApi(apiClient)
         metadataApi = new MetadataServiceApi(apiClient)