diff --git a/pom.xml b/pom.xml
index d3cabd03cb9f..76f65c688367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,8 +107,7 @@
         <jboss-servlet-api_4.0_spec>2.0.0.Final</jboss-servlet-api_4.0_spec>
         <jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
         <jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
-        <log4j.version>1.2.17</log4j.version>
-        <log4j2-api.version>2.25.1</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
+        <log4j2-api.version>2.25.2</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
         <resteasy.version>6.2.12.Final</resteasy.version>
         <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
         <owasp.html.sanitizer.version>20240325.1</owasp.html.sanitizer.version>
@@ -119,9 +118,8 @@
         <sun.xml.ws.version>4.0.0</sun.xml.ws.version>
         <sun.activation.version>1.2.2</sun.activation.version>
         <org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
-        <undertow.version>${undertow-legacy.version}</undertow.version>
         <undertow-legacy.version>2.2.24.Final</undertow-legacy.version>
-        <undertow-jakarta.version>2.3.2.Final</undertow-jakarta.version>
+        <undertow-jakarta.version>2.3.20.Final</undertow-jakarta.version>
         <wildfly-elytron.version>2.6.5.Final</wildfly-elytron.version>
         <elytron.undertow-server.version>1.9.0.Final</elytron.undertow-server.version>
         <woodstox.version>6.0.3</woodstox.version>
@@ -182,7 +180,7 @@
         <infinispan.container>quay.io/infinispan/server:${infinispan.version}</infinispan.container>
 
         <!-- Test -->
-        <greenmail.version>2.1.3</greenmail.version>
+        <greenmail.version>2.1.7</greenmail.version>
         <jmeter.version>2.10</jmeter.version>
         <junit.version>4.13.2</junit.version>
         <picketlink.version>2.7.0.Final</picketlink.version>
@@ -475,8 +473,8 @@
                 <version>${resteasy.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-core</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -545,12 +543,12 @@
             <dependency>
                 <groupId>io.undertow</groupId>
                 <artifactId>undertow-servlet</artifactId>
-                <version>${undertow.version}</version>
+                <version>${undertow-jakarta.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.undertow</groupId>
                 <artifactId>undertow-core</artifactId>
-                <version>${undertow.version}</version>
+                <version>${undertow-jakarta.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
@@ -558,11 +556,6 @@
                 <version>${picketlink.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
diff --git a/test-framework/email-server/pom.xml b/test-framework/email-server/pom.xml
index d9c622f9424c..05f25c5d405c 100755
--- a/test-framework/email-server/pom.xml
+++ b/test-framework/email-server/pom.xml
@@ -32,7 +32,7 @@
     <description>Email server extension for Keycloak Test Framework</description>
 
     <properties>
-        <greenmail.version>2.1.3</greenmail.version>
+        <greenmail.version>2.1.7</greenmail.version>
     </properties>
 
     <dependencies>
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index a0a79227b947..11fd35552a83 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -44,7 +44,7 @@
         <arquillian-core.version>1.9.3.Final</arquillian-core.version>
         <arquillian.protocol.servlet.jakarta.version>10.0.0.Final</arquillian.protocol.servlet.jakarta.version>
         <!--the version of shrinkwrap_resolver should align with the version in arquillian-bom-->
-        <shrinkwrap-resolver.version>3.2.1</shrinkwrap-resolver.version>
+        <shrinkwrap-resolver.version>3.3.4</shrinkwrap-resolver.version>
         <selenium.version>4.28.1</selenium.version>
         <selenium.htmlunit3.version>4.28.0</selenium.htmlunit3.version>
         <arquillian-drone.version>3.0.0-alpha.8</arquillian-drone.version>
@@ -52,7 +52,6 @@
         <arquillian-wildfly-container.version>3.0.1.Final</arquillian-wildfly-container.version>
         <arquillian-wls-container.version>1.0.1.Final</arquillian-wls-container.version>
         <arquillian-infinispan-container.version>1.2.0.Beta3</arquillian-infinispan-container.version>
-        <undertow.version>${undertow-jakarta.version}</undertow.version>
         <undertow-embedded.version>1.0.0.Final</undertow-embedded.version>
         <version.org.wildfly.extras.creaper>2.0.3</version.org.wildfly.extras.creaper>
         <jakarta.persistence-legacy.version>2.2.3</jakarta.persistence-legacy.version>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 6e6b5c7d2488..126c3e475caa 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -1562,15 +1562,9 @@
                     <version>${project.version}</version>
                 </dependency>
 
-                <!--                <dependency>
-                    <groupId>org.arquillian.extension</groupId>
-                    <artifactId>arquillian-recorder-reporter-impl</artifactId>
-                    <version>1.1.0.Final</version>
-                </dependency>-->
-
                 <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>org.slf4j</groupId>
diff --git a/testsuite/integration-arquillian/util/pom.xml b/testsuite/integration-arquillian/util/pom.xml
index 9ac80456946e..a05f590b8eaa 100644
--- a/testsuite/integration-arquillian/util/pom.xml
+++ b/testsuite/integration-arquillian/util/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>2.7.0</version>
+            <version>3.0.0-M2</version>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
diff --git a/testsuite/model/pom.xml b/testsuite/model/pom.xml
index eaf0d13616d6..0badf05ce671 100644
--- a/testsuite/model/pom.xml
+++ b/testsuite/model/pom.xml
@@ -45,8 +45,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml
index 7f76af7a155a..814834990fee 100755
--- a/testsuite/utils/pom.xml
+++ b/testsuite/utils/pom.xml
@@ -78,8 +78,8 @@
             <artifactId>keycloak-account-ui</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -105,8 +105,8 @@
             <artifactId>resteasy-core</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml
index 7e2e899c1f21..34130d7444f1 100644
--- a/util/embedded-ldap/pom.xml
+++ b/util/embedded-ldap/pom.xml
@@ -48,8 +48,8 @@
             <artifactId>jboss-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>