diff --git a/build.gradle b/build.gradle
index 4e3b9b855..1a7943b76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,23 +29,23 @@ ext {
 
 dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.24'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
+    annotationProcessor 'org.projectlombok:lombok:1.18.24'
 
     api ('org.seleniumhq.selenium:selenium-api') {
         version {
-            strictly '[4.0, 5.0)'
+            strictly "[${seleniumVersion}, 5.0)"
             prefer "${seleniumVersion}"
         }
     }
     api ('org.seleniumhq.selenium:selenium-remote-driver') {
         version {
-            strictly '[4.0, 5.0)'
+            strictly "[${seleniumVersion}, 5.0)"
             prefer "${seleniumVersion}"
         }
     }
     implementation ('org.seleniumhq.selenium:selenium-support') {
         version {
-            strictly '[4.0, 5.0)'
+            strictly "[${seleniumVersion}, 5.0)"
             prefer "${seleniumVersion}"
         }
     }
@@ -64,7 +64,7 @@ dependencies {
     }
     testImplementation ('org.seleniumhq.selenium:selenium-chrome-driver') {
         version {
-            strictly '[4.0, 5.0)'
+            strictly "[${seleniumVersion}, 5.0)"
             prefer "${seleniumVersion}"
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 0e37bcb22..cc4c62990 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,4 +7,4 @@ signing.secretKeyRingFile=PathToYourKeyRingFile
 ossrhUsername=your-jira-id
 ossrhPassword=your-jira-password
 
-selenium.version=4.1.1
+selenium.version=4.2.0
diff --git a/src/main/java/io/appium/java_client/remote/AppiumNewSessionCommandPayload.java b/src/main/java/io/appium/java_client/remote/AppiumNewSessionCommandPayload.java
index 81a8f44e1..5ebbdfbc3 100644
--- a/src/main/java/io/appium/java_client/remote/AppiumNewSessionCommandPayload.java
+++ b/src/main/java/io/appium/java_client/remote/AppiumNewSessionCommandPayload.java
@@ -20,7 +20,7 @@
 import com.google.common.collect.ImmutableSet;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.remote.AcceptedW3CCapabilityKeys;
+import org.openqa.selenium.AcceptedW3CCapabilityKeys;
 import org.openqa.selenium.remote.CommandPayload;
 
 import java.util.Map;
diff --git a/src/main/java/io/appium/java_client/remote/options/BaseOptions.java b/src/main/java/io/appium/java_client/remote/options/BaseOptions.java
index b54057314..c157fc684 100644
--- a/src/main/java/io/appium/java_client/remote/options/BaseOptions.java
+++ b/src/main/java/io/appium/java_client/remote/options/BaseOptions.java
@@ -21,7 +21,7 @@
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.remote.AcceptedW3CCapabilityKeys;
+import org.openqa.selenium.AcceptedW3CCapabilityKeys;
 import org.openqa.selenium.remote.CapabilityType;
 
 import javax.annotation.Nullable;
diff --git a/src/test/java/io/appium/java_client/android/AndroidDataMatcherTest.java b/src/test/java/io/appium/java_client/android/AndroidDataMatcherTest.java
index ef54035c6..afe0b7653 100644
--- a/src/test/java/io/appium/java_client/android/AndroidDataMatcherTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidDataMatcherTest.java
@@ -24,13 +24,15 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
+
 import static org.junit.Assert.assertNotNull;
 
 public class AndroidDataMatcherTest extends BaseEspressoTest {
 
     @Test
     public void testFindByDataMatcher() {
-        final WebDriverWait wait = new WebDriverWait(driver, 10);
+        final WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(10));
         wait.until(ExpectedConditions
             .elementToBeClickable(AppiumBy.accessibilityId("Graphics")));
         driver.findElement(AppiumBy.accessibilityId("Graphics")).click();
diff --git a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
index db055c305..293479e53 100644
--- a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
+++ b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
@@ -8,6 +8,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
 import java.util.List;
 
 public class OpenNotificationsTest extends BaseAndroidTest {
@@ -15,7 +16,7 @@ public class OpenNotificationsTest extends BaseAndroidTest {
     public void openNotification() {
         driver.closeApp();
         driver.openNotifications();
-        WebDriverWait wait = new WebDriverWait(driver, 20);
+        WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(20));
         assertNotEquals(0, wait.until(input -> {
             List<WebElement> result = input
                     .findElements(id("com.android.systemui:id/settings_button"));
diff --git a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java
index 07edb2be5..8fa3afd13 100644
--- a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java
@@ -30,15 +30,16 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
 import java.util.function.Supplier;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class IOSAlertTest extends AppIOSTest {
 
-    private static final long ALERT_TIMEOUT_SECONDS = 5;
+    private static final Duration ALERT_TIMEOUT = Duration.ofSeconds(5);
     private static final int CLICK_RETRIES = 2;
 
-    private final WebDriverWait waiter = new WebDriverWait(driver, ALERT_TIMEOUT_SECONDS);
+    private final WebDriverWait waiter = new WebDriverWait(driver, ALERT_TIMEOUT);
     private static final String iOSAutomationText = "show alert";
 
     private void ensureAlertPresence() {