diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa91ad1..bffbc19 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,7 @@ jobs:
           key: m2-{{ checksum "pom.xml" }}
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn --version && whereis java && mvn clean install -Dversion.cassandra4=4.0.14 -Dversion.cassandra41=4.1.7 -Dversion.cassandra50=5.0.2
+      - run: mvn --version && whereis java && mvn clean install -Dversion.cassandra4=4.0.16 -Dversion.cassandra41=4.1.8 -Dversion.cassandra50=5.0.3
 
       - persist_to_workspace:
           root: ~/cassandra-ldap
@@ -53,7 +53,7 @@ jobs:
             - m2-
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra4=4.0.14
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra4=4.0.16
 
       - save_cache:
           paths:
@@ -87,7 +87,7 @@ jobs:
             - m2-
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra41=4.1.7
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra41=4.1.8
 
       - save_cache:
           paths:
@@ -121,7 +121,7 @@ jobs:
             - m2-
 
       - run: sudo apt-get update && sudo apt install openjdk-11-jdk
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra50=5.0.2
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts -Dversion.cassandra50=5.0.3
 
       - save_cache:
           paths:
diff --git a/README.adoc b/README.adoc
index a905085..82790b0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -29,11 +29,11 @@ these classes will be present when such plugin as a whole is put on a class path
 There are five implementation modules:
 
 * cassandra-2.2 - builds against version 2.2.19
-* cassandra-3.0 - builds against version 3.0.28
-* cassandra-3.11 - builds against version 3.11.14
-* cassandra-4.0 - builds against version 4.0.7
-* cassandra-4.1 - builds aganist version 4.1.0
-* cassandra-5.0 - builds aganist version 5.0.0
+* cassandra-3.0 - builds against version 3.0.31
+* cassandra-3.11 - builds against version 3.11.18
+* cassandra-4.0 - builds against version 4.0.16
+* cassandra-4.1 - builds aganist version 4.1.8
+* cassandra-5.0 - builds aganist version 5.0.3
 
 Project is built as:
 
diff --git a/base/pom.xml b/base/pom.xml
index 56690b6..bc378fa 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
-            <version>3.0.28</version>
+            <version>3.0.31</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/build.sh b/build.sh
index 0125260..bb2c480 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 
 mvn clean install \
   -Dversion.cassandra22=2.2.19 \
-  -Dversion.cassandra30=3.0.28 \
-  -Dversion.cassandra311=3.11.14 \
-  -Dversion.cassandra4=4.0.7 \
+  -Dversion.cassandra30=3.0.31 \
+  -Dversion.cassandra311=3.11.18 \
+  -Dversion.cassandra4=4.0.16 \
   -Dversion.cassandra41=4.1.0
diff --git a/cassandra-2.2/pom.xml b/cassandra-2.2/pom.xml
index 7d28003..5abeaf3 100644
--- a/cassandra-2.2/pom.xml
+++ b/cassandra-2.2/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>cassandra-ldap-2.2.19</artifactId>
-    <version>1.1.0</version>
+    <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 2.2</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 2.2</description>
diff --git a/cassandra-3.0/pom.xml b/cassandra-3.0/pom.xml
index 16ce057..40d5b7a 100644
--- a/cassandra-3.0/pom.xml
+++ b/cassandra-3.0/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-3.0.28</artifactId>
-    <version>1.1.0</version>
+    <artifactId>cassandra-ldap-3.0.31</artifactId>
+    <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 3.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 3.0</description>
 
     <properties>
-        <version.cassandra30>3.0.28</version.cassandra30>
+        <version.cassandra30>3.0.31</version.cassandra30>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java b/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java
index fa58e43..3299870 100644
--- a/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java
+++ b/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra30LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra30", "3.0.28");
+        return System.getProperty("version.cassandra30", "3.0.31");
     }
 
     @Override
diff --git a/cassandra-3.11/pom.xml b/cassandra-3.11/pom.xml
index 86a2875..60901ba 100644
--- a/cassandra-3.11/pom.xml
+++ b/cassandra-3.11/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-3.11.14</artifactId>
-    <version>1.1.0</version>
+    <artifactId>cassandra-ldap-3.11.18</artifactId>
+    <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 3.11</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 3.11</description>
 
     <properties>
-        <version.cassandra311>3.11.14</version.cassandra311>
+        <version.cassandra311>3.11.18</version.cassandra311>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java b/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java
index 87c9eea..d7c90f6 100644
--- a/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java
+++ b/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra311LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra311", "3.11.14");
+        return System.getProperty("version.cassandra311", "3.11.18");
     }
 
     @Override
diff --git a/cassandra-4.0/pom.xml b/cassandra-4.0/pom.xml
index e22d185..157152a 100644
--- a/cassandra-4.0/pom.xml
+++ b/cassandra-4.0/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-4.0.14</artifactId>
+    <artifactId>cassandra-ldap-4.0.16</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 4.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 4.0</description>
 
     <properties>
-        <version.cassandra4>4.0.14</version.cassandra4>
+        <version.cassandra4>4.0.16</version.cassandra4>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java b/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
index 243e9f6..5e7cd91 100644
--- a/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
+++ b/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra40LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra4", "4.0.14");
+        return System.getProperty("version.cassandra4", "4.0.16");
     }
 
     @Override
diff --git a/cassandra-4.1/pom.xml b/cassandra-4.1/pom.xml
index 60099ff..16a72e1 100644
--- a/cassandra-4.1/pom.xml
+++ b/cassandra-4.1/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-4.1.7</artifactId>
+    <artifactId>cassandra-ldap-4.1.8</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 4.1</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 4.1</description>
 
     <properties>
-        <version.cassandra41>4.1.7</version.cassandra41>
+        <version.cassandra41>4.1.8</version.cassandra41>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java b/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
index 8b4a97d..5e7dfb5 100644
--- a/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
+++ b/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra41LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra41", "4.1.7");
+        return System.getProperty("version.cassandra41", "4.1.8");
     }
 
     @Override
diff --git a/cassandra-5.0/pom.xml b/cassandra-5.0/pom.xml
index ebdab7c..ca4a3a0 100644
--- a/cassandra-5.0/pom.xml
+++ b/cassandra-5.0/pom.xml
@@ -10,14 +10,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-5.0.2</artifactId>
+    <artifactId>cassandra-ldap-5.0.3</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 5.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 5.0</description>
 
     <properties>
-        <version.cassandra50>5.0.2</version.cassandra50>
+        <version.cassandra50>5.0.3</version.cassandra50>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
diff --git a/cassandra-5.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra50LDAPIntegrationTest.java b/cassandra-5.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra50LDAPIntegrationTest.java
index 6ecea3d..bbadae4 100644
--- a/cassandra-5.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra50LDAPIntegrationTest.java
+++ b/cassandra-5.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra50LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra50LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra50", "5.0.2");
+        return System.getProperty("version.cassandra50", "5.0.3");
     }
 
     @Override