diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6ac8039..89af37a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Enhancements
 ### Bug Fixes
 * Fix issues handling documents without vector fields being populated [288] (https://github.com/opensearch-project/opensearch-jvector/issues/288)
+* Remove usage of the commons-lang 2.6 [317] (https://github.com/opensearch-project/opensearch-jvector/pull/317)
 ### Infrastructure
 ### Documentation
 ### Maintenance
diff --git a/build.gradle b/build.gradle
index 3000038b..d15739ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -311,7 +311,6 @@ dependencies {
     compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
     api group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
     api group: 'com.google.guava', name: 'guava', version:'32.1.3-jre'
-    api group: 'commons-lang', name: 'commons-lang', version: '2.6'
     api "org.apache.commons:commons-lang3:${versions.commonslang}"
     testFixturesImplementation "org.opensearch.test:framework:${opensearch_version}"
     // Add the high-level client dependency
diff --git a/src/main/java/org/opensearch/knn/common/FieldInfoExtractor.java b/src/main/java/org/opensearch/knn/common/FieldInfoExtractor.java
index 67e89d3f..4fd4a7e2 100644
--- a/src/main/java/org/opensearch/knn/common/FieldInfoExtractor.java
+++ b/src/main/java/org/opensearch/knn/common/FieldInfoExtractor.java
@@ -6,7 +6,7 @@
 package org.opensearch.knn.common;
 
 import lombok.experimental.UtilityClass;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.index.FieldInfo;
 import org.apache.lucene.index.LeafReader;
 import org.opensearch.common.Nullable;
diff --git a/src/main/java/org/opensearch/knn/index/engine/KNNMethodContext.java b/src/main/java/org/opensearch/knn/index/engine/KNNMethodContext.java
index 4a4c2704..32f6ffb7 100644
--- a/src/main/java/org/opensearch/knn/index/engine/KNNMethodContext.java
+++ b/src/main/java/org/opensearch/knn/index/engine/KNNMethodContext.java
@@ -23,8 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import static org.opensearch.knn.common.KNNConstants.KNN_ENGINE;
 import static org.opensearch.knn.common.KNNConstants.METHOD_PARAMETER_SPACE_TYPE;
diff --git a/src/main/java/org/opensearch/knn/index/engine/MethodComponentContext.java b/src/main/java/org/opensearch/knn/index/engine/MethodComponentContext.java
index e9199786..1e6e5821 100644
--- a/src/main/java/org/opensearch/knn/index/engine/MethodComponentContext.java
+++ b/src/main/java/org/opensearch/knn/index/engine/MethodComponentContext.java
@@ -8,7 +8,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import static org.opensearch.knn.common.KNNConstants.NAME;
 import static org.opensearch.knn.common.KNNConstants.PARAMETERS;
diff --git a/src/main/java/org/opensearch/knn/index/query/KNNQueryBuilder.java b/src/main/java/org/opensearch/knn/index/query/KNNQueryBuilder.java
index a1964d02..3fe38050 100644
--- a/src/main/java/org/opensearch/knn/index/query/KNNQueryBuilder.java
+++ b/src/main/java/org/opensearch/knn/index/query/KNNQueryBuilder.java
@@ -9,7 +9,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.search.*;
 import org.opensearch.common.ValidationException;
 import org.opensearch.core.ParseField;
diff --git a/src/main/java/org/opensearch/knn/index/util/IndexUtil.java b/src/main/java/org/opensearch/knn/index/util/IndexUtil.java
index 11a7c7b7..0985281d 100644
--- a/src/main/java/org/opensearch/knn/index/util/IndexUtil.java
+++ b/src/main/java/org/opensearch/knn/index/util/IndexUtil.java
@@ -7,7 +7,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java
index 44174e48..c0e5acdc 100644
--- a/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java
+++ b/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java
@@ -6,7 +6,7 @@
 package org.opensearch.knn.plugin.rest;
 
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.opensearch.knn.plugin.JVectorKNNPlugin;
 import org.opensearch.knn.plugin.transport.KNNStatsAction;
 import org.opensearch.knn.plugin.transport.KNNStatsRequest;
diff --git a/src/test/java/org/opensearch/knn/index/engine/JVectorEngineIT.java b/src/test/java/org/opensearch/knn/index/engine/JVectorEngineIT.java
index 323be924..a9745ea3 100644
--- a/src/test/java/org/opensearch/knn/index/engine/JVectorEngineIT.java
+++ b/src/test/java/org/opensearch/knn/index/engine/JVectorEngineIT.java
@@ -10,7 +10,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import lombok.SneakyThrows;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.junit.After;
@@ -287,7 +287,7 @@ public void testIndexReopening() throws Exception {
         }
 
         final float[] searchVector = TEST_QUERY_VECTORS[0];
-        final int k = 1 + RandomUtils.nextInt(TEST_INDEX_VECTORS.length);
+        final int k = 1 + RandomUtils.secure().randomInt(0, TEST_INDEX_VECTORS.length);
 
         final List<float[]> knnResultsBeforeIndexClosure = queryResults(searchVector, k);
 
diff --git a/src/test/java/org/opensearch/knn/index/engine/LuceneEngineIT.java b/src/test/java/org/opensearch/knn/index/engine/LuceneEngineIT.java
index 12850cb4..407cd7b1 100644
--- a/src/test/java/org/opensearch/knn/index/engine/LuceneEngineIT.java
+++ b/src/test/java/org/opensearch/knn/index/engine/LuceneEngineIT.java
@@ -8,7 +8,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import lombok.SneakyThrows;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.lucene.util.VectorUtil;
 import org.junit.After;
@@ -456,7 +456,7 @@ public void testIndexReopening() throws Exception {
         }
 
         final float[] searchVector = TEST_QUERY_VECTORS[0];
-        final int k = 1 + RandomUtils.nextInt(TEST_INDEX_VECTORS.length);
+        final int k = 1 + RandomUtils.secure().randomInt(0, TEST_INDEX_VECTORS.length);
 
         final List<float[]> knnResultsBeforeIndexClosure = queryResults(searchVector, k);