diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 627b40c04..ab6b9b8ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build Maven
 
 on:
   push:
-    branches: [ 'sustaining/2.4.x','master' ]
+    branches: [ 'sustaining/2.4.x','master', 'issues/**', 'features/**' ]
   pull_request:
 jobs:
   build-maven:
diff --git a/cassandra-embedded/pom.xml b/cassandra-embedded/pom.xml
index 2838ec598..668722cdd 100644
--- a/cassandra-embedded/pom.xml
+++ b/cassandra-embedded/pom.xml
@@ -12,7 +12,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2019-2025 3A Systems LLC.
+ * Copyright 2019-2026 3A Systems LLC.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -61,14 +61,12 @@
   </properties>
   <dependencies>
 		<dependency>
-		    <groupId>com.datastax.oss</groupId>
+		    <groupId>org.apache.cassandra</groupId>
 		    <artifactId>java-driver-core</artifactId>
-		    <version>4.17.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.cassandra</groupId>
 		    <artifactId>cassandra-all</artifactId>
-		    <version>5.0.6</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.lz4</groupId>
diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml
index dbac7510f..f20ecd44a 100644
--- a/commons/util/util/pom.xml
+++ b/commons/util/util/pom.xml
@@ -12,7 +12,7 @@
   ~ information: "Portions copyright [year] [name of copyright owner]".
   ~
   ~ Copyright 2015 ForgeRock AS.
-  ~ Portions copyright 2025 3A Systems LLC.
+  ~ Portions copyright 2025-2026 3A Systems LLC.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -35,9 +35,9 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openjdk.nashorn</groupId>
-            <artifactId>nashorn-core</artifactId>
-            <version>15.4</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
+            <version>${rhino.servicemix.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java
index b91fbc2eb..cd2d52b36 100644
--- a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java
+++ b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java
@@ -12,10 +12,13 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020-2026 3A Systems LLC.
  */
 
 package org.forgerock.json;
 
+import org.mozilla.javascript.engine.RhinoScriptEngineFactory;
+
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
@@ -73,7 +76,7 @@ public static ScriptEngine getJSScriptEngine() {
         if (Double.parseDouble(System.getProperty("java.specification.version")) < 15) {
             return new ScriptEngineManager(null).getEngineByName("js");
         } else {
-        	return new ScriptEngineManager().getEngineByName("js");
+        	return new RhinoScriptEngineFactory().getScriptEngine();
         }
     }
 }
diff --git a/pom.xml b/pom.xml
index ececd2c74..500c2922b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,8 @@
         <jetty.version>11.0.25</jetty.version>
         <grizzly-framework.version>3.0.1</grizzly-framework.version>
         <servlet-api.version>5.0.0</servlet-api.version>
+        <cassandra.version>4.19.2</cassandra.version>
+        <cassandra-all.version>5.0.6</cassandra-all.version>
     </properties>
 
     <prerequisites>
@@ -918,6 +920,27 @@
                 <groupId>org.glassfish.grizzly</groupId>
                 <artifactId>grizzly-websockets</artifactId>
                 <version>${grizzly-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cassandra</groupId>
+                <artifactId>java-driver-core</artifactId>
+                <version>${cassandra.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cassandra</groupId>
+                <artifactId>java-driver-query-builder</artifactId>
+                <version>${cassandra.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cassandra</groupId>
+                <artifactId>cassandra-all</artifactId>
+                <version>${cassandra-all.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.lz4</groupId>
+                        <artifactId>lz4-java</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 		</dependencies>
 	</dependencyManagement>