diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32de6fd..cfb772d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.5.8 (April 19, 2024)
+* Updated Sailor to 4.0.2
+
 ## 2.5.7 (July 07, 2023)
 * Bumped Sailor to 4.0.1
 
diff --git a/build.gradle b/build.gradle
index 421ea70..0b3f031 100755
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ if (hasProperty('runWithDependencyCheck')) {
 
     dependencyCheck {
         format = 'HTML'
-        failBuildOnCVSS = 8
+        failBuildOnCVSS = 9
         suppressionFile='./dependencyCheck-suppression.xml'
     }
 }
@@ -74,9 +74,9 @@ dependencies {
     compile 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
     compile 'com.google.code.gson:gson:2.10'
     compile 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
-    compile 'io.elastic:sailor-jvm:4.0.1'
+    compile 'io.elastic:sailor-jvm:4.0.2-SNAPSHOT'
     compile 'mysql:mysql-connector-java:8.0.29'
-    compile 'org.postgresql:postgresql:42.5.0'
+    compile 'org.postgresql:postgresql:42.5.6'
 
     testCompile 'io.github.cdimascio:java-dotenv:5.1.0'
     testCompile 'org.hsqldb:hsqldb:2.0.0'
diff --git a/component.json b/component.json
index a2cc951..949478c 100755
--- a/component.json
+++ b/component.json
@@ -1,7 +1,7 @@
 {
   "title": "Database",
   "description": "Database JDBC connector",
-  "version": "2.5.7",
+  "version": "2.5.8-dev.2",
   "credentials": {
     "verifier": "io.elastic.jdbc.JdbcCredentialsVerifier",
     "fields": {
diff --git a/src/test/groovy/io/elastic/jdbc/integration/actions/select_action/SelectMySQLSpec.groovy b/src/test/groovy/io/elastic/jdbc/integration/actions/select_action/SelectMySQLSpec.groovy
index 980e838..efec25e 100644
--- a/src/test/groovy/io/elastic/jdbc/integration/actions/select_action/SelectMySQLSpec.groovy
+++ b/src/test/groovy/io/elastic/jdbc/integration/actions/select_action/SelectMySQLSpec.groovy
@@ -4,8 +4,7 @@ import io.elastic.api.EventEmitter
 import io.elastic.api.ExecutionParameters
 import io.elastic.api.Message
 import io.elastic.jdbc.TestUtils
-import io.elastic.jdbc.actions.SelectAction
-import spock.lang.Ignore
+import io.elastic.jdbc.actions.NewSelectAction
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -47,7 +46,7 @@ class SelectMySQLSpec extends Specification {
   @Shared
   EventEmitter emitter
   @Shared
-  SelectAction action
+  NewSelectAction action
 
   def setupSpec() {
     connection = DriverManager.getConnection(connectionString, user, password)
@@ -58,22 +57,24 @@ class SelectMySQLSpec extends Specification {
   }
 
   def createAction() {
-    action = new SelectAction()
+    action = new NewSelectAction()
   }
 
   def runAction(JsonObject config, JsonObject body, JsonObject snapshot) {
-    Message msg = new Message.Builder().body(body).build()
+    Message msg = new Message.Builder()
+            .body(body)
+            .build()
     errorCallback = Mock(EventEmitter.Callback)
     snapshotCallback = Mock(EventEmitter.Callback)
     dataCallback = Mock(EventEmitter.Callback)
     reboundCallback = Mock(EventEmitter.Callback)
     onHttpReplyCallback = Mock(EventEmitter.Callback)
     emitter = new EventEmitter.Builder()
-        .onData(dataCallback)
-        .onSnapshot(snapshotCallback)
-        .onError(errorCallback)
-        .onRebound(reboundCallback)
-        .onHttpReplyCallback(onHttpReplyCallback).build()
+            .onData(dataCallback)
+            .onSnapshot(snapshotCallback)
+            .onError(errorCallback)
+            .onRebound(reboundCallback)
+            .onHttpReplyCallback(onHttpReplyCallback).build()
     ExecutionParameters params = new ExecutionParameters(msg, emitter, config, snapshot)
     action.execute(params);
   }
@@ -81,7 +82,7 @@ class SelectMySQLSpec extends Specification {
   def getStarsConfig() {
     JsonObject config = TestUtils.getMysqlConfigurationBuilder()
         .add("sqlQuery", "SELECT * from stars where @id:number =id AND name=@name")
-        .build()
+            .build()
     return config;
   }