diff --git a/core/src/main/java/io/kestra/plugin/core/kv/Get.java b/core/src/main/java/io/kestra/plugin/core/kv/Get.java
index fcb32198e68..15a0a3f8385 100644
--- a/core/src/main/java/io/kestra/plugin/core/kv/Get.java
+++ b/core/src/main/java/io/kestra/plugin/core/kv/Get.java
@@ -10,14 +10,15 @@
 import io.kestra.core.services.FlowService;
 import io.kestra.core.storages.kv.KVValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.codehaus.commons.nullanalysis.NotNull;
 
-import java.util.*;
+import java.util.NoSuchElementException;
+import java.util.Optional;
 
 @Slf4j
 @SuperBuilder(toBuilder = true)
diff --git a/core/src/main/java/io/kestra/plugin/core/kv/GetKeys.java b/core/src/main/java/io/kestra/plugin/core/kv/GetKeys.java
index 4c61bee79d4..0ed6b396df0 100644
--- a/core/src/main/java/io/kestra/plugin/core/kv/GetKeys.java
+++ b/core/src/main/java/io/kestra/plugin/core/kv/GetKeys.java
@@ -10,12 +10,12 @@
 import io.kestra.core.services.FlowService;
 import io.kestra.core.storages.kv.KVEntry;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.codehaus.commons.nullanalysis.NotNull;
 
 import java.util.*;
 
diff --git a/core/src/main/java/io/kestra/plugin/core/kv/Set.java b/core/src/main/java/io/kestra/plugin/core/kv/Set.java
index 2f36ecca59b..bcc2bef06c7 100644
--- a/core/src/main/java/io/kestra/plugin/core/kv/Set.java
+++ b/core/src/main/java/io/kestra/plugin/core/kv/Set.java
@@ -11,11 +11,11 @@
 import io.kestra.core.storages.kv.KVStore;
 import io.kestra.core.storages.kv.KVValueAndMetadata;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.codehaus.commons.nullanalysis.NotNull;
 
 import java.time.Duration;
 
diff --git a/core/src/main/java/io/kestra/plugin/core/namespace/DeleteFiles.java b/core/src/main/java/io/kestra/plugin/core/namespace/DeleteFiles.java
index e46acc15ee6..3f008c5b8e1 100644
--- a/core/src/main/java/io/kestra/plugin/core/namespace/DeleteFiles.java
+++ b/core/src/main/java/io/kestra/plugin/core/namespace/DeleteFiles.java
@@ -12,11 +12,11 @@
 import io.kestra.core.utils.PathMatcherPredicate;
 import io.kestra.core.utils.Rethrow;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.codehaus.commons.nullanalysis.NotNull;
 import org.slf4j.Logger;
 
 import java.net.URI;
diff --git a/core/src/main/java/io/kestra/plugin/core/namespace/DownloadFiles.java b/core/src/main/java/io/kestra/plugin/core/namespace/DownloadFiles.java
index bb0052b4d69..2cf77e3e4d3 100644
--- a/core/src/main/java/io/kestra/plugin/core/namespace/DownloadFiles.java
+++ b/core/src/main/java/io/kestra/plugin/core/namespace/DownloadFiles.java
@@ -11,12 +11,12 @@
 import io.kestra.core.utils.PathMatcherPredicate;
 import io.kestra.core.utils.Rethrow;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.codehaus.commons.nullanalysis.NotNull;
 import org.slf4j.Logger;
 
 import java.io.InputStream;
diff --git a/core/src/main/java/io/kestra/plugin/core/namespace/UploadFiles.java b/core/src/main/java/io/kestra/plugin/core/namespace/UploadFiles.java
index b5dbf2846e7..26e71f07511 100644
--- a/core/src/main/java/io/kestra/plugin/core/namespace/UploadFiles.java
+++ b/core/src/main/java/io/kestra/plugin/core/namespace/UploadFiles.java
@@ -10,11 +10,11 @@
 import io.kestra.core.serializers.JacksonMapper;
 import io.kestra.core.storages.Namespace;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.codehaus.commons.nullanalysis.NotNull;
 
 import java.io.File;
 import java.io.FileInputStream;