diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 073aff087..78e6fd970 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,6 +31,8 @@ jobs:
            test_suite: 'verify -P docker-integration-test,standalone-integration-tests -DskipUTs'
          - name: "Standalone integration 4.1"
            test_suite: 'verify -P docker-integration-test,standalone-integration-tests -Dit.cassandra.version=4.1 -DskipUTs'
+         - name: "Standalone integration 5.0-alpha1"
+           test_suite: 'verify -P docker-integration-test,standalone-integration-tests -Dit.cassandra.version=5.0-alpha1 -DskipUTs'
          - name: "Python integration"
            test_suite: 'verify -P docker-integration-test,python-integration-tests -DskipUTs'
     steps:
diff --git a/cassandra-test-image/src/main/docker/ecc-entrypoint.sh b/cassandra-test-image/src/main/docker/ecc-entrypoint.sh
index 73ff0a58c..05650b00e 100755
--- a/cassandra-test-image/src/main/docker/ecc-entrypoint.sh
+++ b/cassandra-test-image/src/main/docker/ecc-entrypoint.sh
@@ -17,6 +17,9 @@
 set -e
 
 sed -i "s/authenticator: .*/authenticator: PasswordAuthenticator/g" "$CASSANDRA_CONF"/cassandra.yaml
+# Start of for 5.X
+sed -i "/^authenticator:/{n;s/class_name : .*/class_name : PasswordAuthenticator/}" "$CASSANDRA_CONF"/cassandra.yaml
+# End of for 5.X
 sed -i "s/^authorizer: .*/authorizer: CassandraAuthorizer/g" "$CASSANDRA_CONF"/cassandra.yaml
 
 sed -i "s/num_tokens: .*/num_tokens: 16/g" "$CASSANDRA_CONF"/cassandra.yaml
diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md
index 4bb3c61b4..234c49378 100644
--- a/docs/COMPATIBILITY.md
+++ b/docs/COMPATIBILITY.md
@@ -2,8 +2,8 @@
 
 Below matrix defines which ecChronos versions have been tested and verified with which Cassandra version.
 
-| ecchronos version      | Cassandra 3.0.X | Cassandra 3.11.X | Cassandra 4.0.X | Cassandra 4.1.X |
-|------------------------|-----------------|------------------|-----------------|-----------------|
-| <= 2.0.5            | X               | X                |                 |                 |
-| > 2.0.5  < 5.0.0 | X               | X                | X               |                 |
-| >= 5.0.0            |                 |                  | X               | X               |
\ No newline at end of file
+| ecchronos version      | Cassandra 3.0.X | Cassandra 3.11.X | Cassandra 4.0.X | Cassandra 4.1.X | Cassandra 5.0-alpha1 |
+|------------------------|-----------------|------------------|-----------------|-----------------|----------------------|
+| <= 2.0.5            | X               | X                |                 |                 |                      |
+| > 2.0.5  < 5.0.0 | X               | X                | X               |                 |                      |
+| >= 5.0.0            |                 |                  | X               | X               | X                    |
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2f66c17bd..7b7b70762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -912,7 +912,7 @@ limitations under the License.
                                                     <memorySwap>-1</memorySwap>
                                                     <env>
                                                         <LOCAL_JMX>no</LOCAL_JMX>
-                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap} -Xmn100M</JVM_OPTS>
+                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
                                                         <JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.ring_delay_ms=0</JVM_EXTRA_OPTS>
                                                     </env>
                                                     <exposedPropertyKey>seed</exposedPropertyKey>
@@ -941,7 +941,7 @@ limitations under the License.
                                                         <LOCAL_JMX>no</LOCAL_JMX>
                                                         <HOSTNAME>$HOSTNAME</HOSTNAME>
                                                         <CASSANDRA_SEEDS>$${docker.container.seed.ip}</CASSANDRA_SEEDS>
-                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap} -Xmn100M</JVM_OPTS>
+                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
                                                         <JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.gossip_settle_min_wait_ms=100 -Dcassandra.gossip_settle_interval_ms=100 -Dcassandra.ring_delay_ms=4000</JVM_EXTRA_OPTS>
                                                     </env>
                                                     <volumes>
@@ -968,7 +968,7 @@ limitations under the License.
                                                     <env>
                                                         <LOCAL_JMX>no</LOCAL_JMX>
                                                         <CASSANDRA_SEEDS>$${docker.container.seed.ip}</CASSANDRA_SEEDS>
-                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap} -Xmn100M</JVM_OPTS>
+                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
                                                         <JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.gossip_settle_min_wait_ms=100 -Dcassandra.gossip_settle_interval_ms=100 -Dcassandra.ring_delay_ms=4000</JVM_EXTRA_OPTS>
                                                     </env>
                                                     <volumes>
@@ -995,7 +995,7 @@ limitations under the License.
                                                     <env>
                                                         <LOCAL_JMX>no</LOCAL_JMX>
                                                         <CASSANDRA_SEEDS>$${docker.container.seed.ip}</CASSANDRA_SEEDS>
-                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap} -Xmn100M</JVM_OPTS>
+                                                        <JVM_OPTS>-Xmx${it.cassandra.heap} -Xms${it.cassandra.heap}</JVM_OPTS>
                                                         <JVM_EXTRA_OPTS>-Dcom.sun.management.jmxremote.authenticate=false -Dcassandra.superuser_setup_delay_ms=0 -Dcassandra.gossip_settle_min_wait_ms=100 -Dcassandra.gossip_settle_interval_ms=100 -Dcassandra.ring_delay_ms=4000</JVM_EXTRA_OPTS>
                                                     </env>
                                                     <volumes>