diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86223c461c..d71fef5a96 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ 'sustaining/15.2.x','master' ]
+    branches: [ 'sustaining/15.2.x','master','issues/**','features/**' ]
   pull_request:
 jobs:
   build-maven:
diff --git a/openam-authentication/openam-auth-ntlmv2/pom.xml b/openam-authentication/openam-auth-ntlmv2/pom.xml
index e2d278fca5..8f8bb94bf6 100755
--- a/openam-authentication/openam-auth-ntlmv2/pom.xml
+++ b/openam-authentication/openam-auth-ntlmv2/pom.xml
@@ -13,7 +13,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2023 Open Identity Platform Community.
- * 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>
@@ -52,6 +52,12 @@
             <groupId>ch.poweredge.ntlmv2-auth</groupId>
             <artifactId>ntlmv2-lib</artifactId>
             <version>1.0.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/openam-cassandra/openam-cassandra-cts/pom.xml b/openam-cassandra/openam-cassandra-cts/pom.xml
index eff3ae0b13..90fd5ca89a 100644
--- a/openam-cassandra/openam-cassandra-cts/pom.xml
+++ b/openam-cassandra/openam-cassandra-cts/pom.xml
@@ -13,7 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2019 Open Identity Platform Community.
- * 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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
 			<version>3.19.0-GA</version>
 		</dependency>
 		<dependency>
-			  <groupId>com.datastax.oss</groupId>
+			  <groupId>org.apache.cassandra</groupId>
 			  <artifactId>java-driver-query-builder</artifactId>
 		</dependency>
 		<dependency>
diff --git a/openam-cassandra/openam-cassandra-datastore/pom.xml b/openam-cassandra/openam-cassandra-datastore/pom.xml
index 67012f5e45..e372f735ea 100644
--- a/openam-cassandra/openam-cassandra-datastore/pom.xml
+++ b/openam-cassandra/openam-cassandra-datastore/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>
@@ -31,7 +31,7 @@
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>com.datastax.oss</groupId>
+		    <groupId>org.apache.cassandra</groupId>
 		    <artifactId>java-driver-core</artifactId>
 		</dependency>
 		<dependency>
diff --git a/openam-cassandra/openam-cassandra-embedded/pom.xml b/openam-cassandra/openam-cassandra-embedded/pom.xml
index c0db4b6831..15c67f262b 100644
--- a/openam-cassandra/openam-cassandra-embedded/pom.xml
+++ b/openam-cassandra/openam-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>
@@ -28,7 +28,7 @@
   <description>OpenAM Embedded Cassandra</description>
   <dependencies>
   		<dependency>
-		    <groupId>com.datastax.oss</groupId>
+		    <groupId>org.apache.cassandra</groupId>
 		    <artifactId>java-driver-core</artifactId>
 		</dependency>
 		<dependency>
diff --git a/openam-cassandra/pom.xml b/openam-cassandra/pom.xml
index 9824626451..4fb965ca9e 100644
--- a/openam-cassandra/pom.xml
+++ b/openam-cassandra/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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -36,27 +36,6 @@
     </modules>
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-			    <groupId>com.datastax.oss</groupId>
-			    <artifactId>java-driver-core</artifactId>
-			    <version>4.17.0</version>
-			</dependency>
-			<dependency>
-			  <groupId>com.datastax.oss</groupId>
-			  <artifactId>java-driver-query-builder</artifactId>
-			  <version>4.17.0</version>
-			</dependency>
-			<dependency>
-			    <groupId>org.apache.cassandra</groupId>
-			    <artifactId>cassandra-all</artifactId>
-			    <version>4.0.20</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.lz4</groupId>
-						<artifactId>lz4-java</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>at.yawk.lz4</groupId>
 				<artifactId>lz4-java</artifactId>
@@ -122,6 +101,25 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>skip-cassandra-tests-on-windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<skipTests>true</skipTests>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
 
diff --git a/openam-schema/openam-idsvcs-schema/pom.xml b/openam-schema/openam-idsvcs-schema/pom.xml
index f8a54170e0..48e27866f3 100644
--- a/openam-schema/openam-idsvcs-schema/pom.xml
+++ b/openam-schema/openam-idsvcs-schema/pom.xml
@@ -127,12 +127,6 @@
             <artifactId>javax.xml.soap-api</artifactId>
             <version>1.4.0</version>
         </dependency>
-
-        <dependency>
-            <groupId>jakarta.xml.soap</groupId>
-            <artifactId>jakarta.xml.soap-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.openidentityplatform.openam.jakarta</groupId>
             <artifactId>jaxrpc-impl</artifactId>
diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml
index 99200b6796..a0acf1bf05 100644
--- a/openam-server-only/pom.xml
+++ b/openam-server-only/pom.xml
@@ -65,8 +65,8 @@
                                 <artifactItem>
                                     <groupId>org.openidentityplatform.opendj</groupId>
                                     <artifactId>opendj-server-legacy</artifactId>
-                                    <version>${opendj.server.legacy}</version>
                                     <type>zip</type>
+                                    <classifier>slim</classifier>
                                 </artifactItem>
                             </artifactItems>
 
diff --git a/pom.xml b/pom.xml
index 1d22b488f9..4e849b3ba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <!-- Supress checkstyle errors on legacy com.iplanet and com.sun.identity packages -->
     <checkstyleUnitTestSuppressionsLocation>checkstyle/suppressions.xml</checkstyleUnitTestSuppressionsLocation>
-    <opendj.version>5.0.4</opendj.version>
+    <opendj.version>5.0.5-SNAPSHOT</opendj.version>
     <javadoc-utils.version>1.0.0</javadoc-utils.version>
     <ant.contrib.version>1.0b3</ant.contrib.version>
     <guice.version>7.0.0</guice.version>
@@ -1314,21 +1314,29 @@
 <!--         <version>${opendj.server.version}</version> -->
 <!--       </dependency> -->
       <!-- OpenDJ Server -->
-<!--       <dependency> -->
-<!--         <groupId>org.openidentityplatform.opendj</groupId> -->
-<!--         <artifactId>opendj-server-legacy</artifactId> -->
-<!--         <version>${opendj.server.legacy}</version> -->
-<!--         <exclusions> -->
-<!--           <exclusion> -->
-<!--             <groupId>org.slf4j</groupId> -->
-<!--             <artifactId>slf4j-jdk14</artifactId> -->
-<!--           </exclusion> -->
-<!--           <exclusion> -->
-<!--             <groupId>javax.servlet</groupId> -->
-<!--             <artifactId>javax.servlet-api</artifactId> -->
-<!--           </exclusion> -->
-<!--         </exclusions> -->
-<!--       </dependency> -->
+       <dependency>
+         <groupId>org.openidentityplatform.opendj</groupId>
+         <artifactId>opendj-server-legacy</artifactId>
+         <version>${opendj.version}</version>
+         <exclusions>
+           <exclusion>
+             <groupId>com.mysql</groupId>
+             <artifactId>mysql-connector-j</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.oracle.database.jdbc</groupId>
+             <artifactId>ojdbc8</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.microsoft.sqlserver</groupId>
+             <artifactId>mssql-jdbc</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.postgresql</groupId>
+             <artifactId>postgresql</artifactId>
+           </exclusion>
+         </exclusions>
+       </dependency>
 <!--       <dependency> -->
 <!--         <groupId>org.openidentityplatform.opendj</groupId> -->
 <!--         <artifactId>opendj-server-legacy</artifactId> -->
@@ -1416,6 +1424,12 @@
         <groupId>org.restlet.jee</groupId>
         <artifactId>org.restlet.ext.freemarker</artifactId>
         <version>${restlet.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.restlet.jee</groupId>
@@ -1700,11 +1714,6 @@
    			<artifactId>woodstox-core</artifactId>
             <version>6.4.0</version>
    		</dependency>
-		<dependency>
-			<groupId>org.owasp.antisamy</groupId>
-			<artifactId>antisamy</artifactId>
-			<version>1.7.5</version>
-		 </dependency>	
         <dependency>
             <groupId>com.github.jnr</groupId>
             <artifactId>jnr-posix</artifactId>