diff --git a/src/server-am/Dockerfile b/src/server-am/Dockerfile
index e1a204ce..846ae04b 100644
--- a/src/server-am/Dockerfile
+++ b/src/server-am/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21-alpine AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25-alpine AS build
 
 WORKDIR /src
 
@@ -18,7 +18,7 @@ COPY server-am/ server-am/
 # Build only the specific module and its dependencies
 RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-am -am
 
-FROM docker.io/library/jetty:12-jre21-eclipse-temurin
+FROM docker.io/library/jetty:12.1-jdk25-eclipse-temurin
 
 # Add metadata
 LABEL org.opencontainers.image.title="OSLC RefImpl AM Server"
@@ -32,6 +32,15 @@ LABEL org.opencontainers.image.licenses="EPL-2.0"
 
 COPY --from=build /src/server-am/target/*.war /var/lib/jetty/webapps/ROOT.war
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl
+RUN rm -f "$JETTY_BASE/start.d/threadpool.ini" && \
+    java -jar "$JETTY_HOME/start.jar" \
+      --add-modules=ee10-deploy,ee10-jsp,ee10-jstl,threadpool-virtual && \
+    printf '%s\n' \
+      'jetty.threadPool.minThreads=8' \
+      'jetty.threadPool.maxThreads=64' \
+      'jetty.threadPool.reservedThreads=-1' \
+      'jetty.threadPool.virtual.maxConcurrentTasks=500' \
+      'jetty.threadPool.virtual.tracking=false' \
+      >> "$JETTY_BASE/start.d/threadpool-virtual.ini"
 
 EXPOSE 8080
diff --git a/src/server-am/tomcat.Dockerfile b/src/server-am/tomcat.Dockerfile
index 50e86ab4..b2d37fdb 100644
--- a/src/server-am/tomcat.Dockerfile
+++ b/src/server-am/tomcat.Dockerfile
@@ -1,13 +1,34 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21 AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25 AS build
 
 COPY . /src
 WORKDIR /src
-RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-am -am -Pwith-jstl-impl
 
-FROM docker.io/library/tomcat:10-jre25
+RUN mvn -B --no-transfer-progress \
+    -DskipTests \
+    clean package \
+    -pl server-am \
+    -am \
+    -Pwith-jstl-impl
+
+
+FROM docker.io/library/tomcat:10.1-jre25-temurin
+
+# Enable virtual threads for requests handled by the default HTTP connector.
+RUN sed -i \
+      's|<Connector port="8080" protocol="HTTP/1.1"|<Connector port="8080" protocol="HTTP/1.1" useVirtualThreads="true"|' \
+      "$CATALINA_HOME/conf/server.xml" && \
+    grep -q 'useVirtualThreads="true"' \
+      "$CATALINA_HOME/conf/server.xml"
+
+# Do not write catalina.out; log through the container runtime.
+COPY --from=build \
+    /src/server-am/config/tomcat-log.properties \
+    "$CATALINA_HOME/conf/logging.properties"
 
-# do not write log files, log everything to the Docker daemon
-COPY --from=build /src/server-am/config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
 ENV CATALINA_OUT=/dev/null
 
-COPY --from=build /src/server-am/target/*.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=build \
+    /src/server-am/target/*.war \
+    "$CATALINA_HOME/webapps/ROOT.war"
+
+EXPOSE 8080
diff --git a/src/server-cm/Dockerfile b/src/server-cm/Dockerfile
index 92b2d6d0..c280f534 100644
--- a/src/server-cm/Dockerfile
+++ b/src/server-cm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21-alpine AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25-alpine AS build
 
 WORKDIR /src
 
@@ -18,7 +18,7 @@ COPY server-cm/ server-cm/
 # Build only the specific module and its dependencies
 RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-cm -am
 
-FROM docker.io/library/jetty:12-jre21-eclipse-temurin
+FROM docker.io/library/jetty:12.1-jdk25-eclipse-temurin
 
 # Add metadata
 LABEL org.opencontainers.image.title="OSLC RefImpl CM Server"
@@ -32,6 +32,15 @@ LABEL org.opencontainers.image.licenses="EPL-2.0"
 
 COPY --from=build /src/server-cm/target/*.war /var/lib/jetty/webapps/ROOT.war
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl
+RUN rm -f "$JETTY_BASE/start.d/threadpool.ini" && \
+    java -jar "$JETTY_HOME/start.jar" \
+      --add-modules=ee10-deploy,ee10-jsp,ee10-jstl,threadpool-virtual && \
+    printf '%s\n' \
+      'jetty.threadPool.minThreads=8' \
+      'jetty.threadPool.maxThreads=64' \
+      'jetty.threadPool.reservedThreads=-1' \
+      'jetty.threadPool.virtual.maxConcurrentTasks=500' \
+      'jetty.threadPool.virtual.tracking=false' \
+      >> "$JETTY_BASE/start.d/threadpool-virtual.ini"
 
 EXPOSE 8080
diff --git a/src/server-cm/tomcat.Dockerfile b/src/server-cm/tomcat.Dockerfile
index d797e4f3..afd8c99e 100644
--- a/src/server-cm/tomcat.Dockerfile
+++ b/src/server-cm/tomcat.Dockerfile
@@ -1,13 +1,34 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21 AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25 AS build
 
 COPY . /src
 WORKDIR /src
-RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-cm -am -Pwith-jstl-impl
 
-FROM docker.io/library/tomcat:10-jre25
+RUN mvn -B --no-transfer-progress \
+    -DskipTests \
+    clean package \
+    -pl server-cm \
+    -am \
+    -Pwith-jstl-impl
+
+
+FROM docker.io/library/tomcat:10.1-jre25-temurin
+
+# Enable virtual threads for requests handled by the default HTTP connector.
+RUN sed -i \
+      's|<Connector port="8080" protocol="HTTP/1.1"|<Connector port="8080" protocol="HTTP/1.1" useVirtualThreads="true"|' \
+      "$CATALINA_HOME/conf/server.xml" && \
+    grep -q 'useVirtualThreads="true"' \
+      "$CATALINA_HOME/conf/server.xml"
+
+# Do not write catalina.out; log through the container runtime.
+COPY --from=build \
+    /src/server-cm/config/tomcat-log.properties \
+    "$CATALINA_HOME/conf/logging.properties"
 
-# do not write log files, log everything to the Docker daemon
-COPY --from=build /src/server-cm/config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
 ENV CATALINA_OUT=/dev/null
 
-COPY --from=build /src/server-cm/target/*.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=build \
+    /src/server-cm/target/*.war \
+    "$CATALINA_HOME/webapps/ROOT.war"
+
+EXPOSE 8080
diff --git a/src/server-qm/Dockerfile b/src/server-qm/Dockerfile
index e7f0fb07..e183e341 100644
--- a/src/server-qm/Dockerfile
+++ b/src/server-qm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21-alpine AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25-alpine AS build
 
 WORKDIR /src
 
@@ -18,7 +18,7 @@ COPY server-qm/ server-qm/
 # Build only the specific module and its dependencies
 RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-qm -am
 
-FROM docker.io/library/jetty:12-jre21-eclipse-temurin
+FROM docker.io/library/jetty:12.1-jdk25-eclipse-temurin
 
 # Add metadata
 LABEL org.opencontainers.image.title="OSLC RefImpl QM Server"
@@ -32,6 +32,15 @@ LABEL org.opencontainers.image.licenses="EPL-2.0"
 
 COPY --from=build /src/server-qm/target/*.war /var/lib/jetty/webapps/ROOT.war
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl
+RUN rm -f "$JETTY_BASE/start.d/threadpool.ini" && \
+    java -jar "$JETTY_HOME/start.jar" \
+      --add-modules=ee10-deploy,ee10-jsp,ee10-jstl,threadpool-virtual && \
+    printf '%s\n' \
+      'jetty.threadPool.minThreads=8' \
+      'jetty.threadPool.maxThreads=64' \
+      'jetty.threadPool.reservedThreads=-1' \
+      'jetty.threadPool.virtual.maxConcurrentTasks=500' \
+      'jetty.threadPool.virtual.tracking=false' \
+      >> "$JETTY_BASE/start.d/threadpool-virtual.ini"
 
 EXPOSE 8080
diff --git a/src/server-qm/tomcat.Dockerfile b/src/server-qm/tomcat.Dockerfile
index 16b46139..940ce342 100644
--- a/src/server-qm/tomcat.Dockerfile
+++ b/src/server-qm/tomcat.Dockerfile
@@ -1,13 +1,34 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21 AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25 AS build
 
 COPY . /src
 WORKDIR /src
-RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-qm -am -Pwith-jstl-impl
 
-FROM docker.io/library/tomcat:10-jre25
+RUN mvn -B --no-transfer-progress \
+    -DskipTests \
+    clean package \
+    -pl server-qm \
+    -am \
+    -Pwith-jstl-impl
+
+
+FROM docker.io/library/tomcat:10.1-jre25-temurin
+
+# Enable virtual threads for requests handled by the default HTTP connector.
+RUN sed -i \
+      's|<Connector port="8080" protocol="HTTP/1.1"|<Connector port="8080" protocol="HTTP/1.1" useVirtualThreads="true"|' \
+      "$CATALINA_HOME/conf/server.xml" && \
+    grep -q 'useVirtualThreads="true"' \
+      "$CATALINA_HOME/conf/server.xml"
+
+# Do not write catalina.out; log through the container runtime.
+COPY --from=build \
+    /src/server-qm/config/tomcat-log.properties \
+    "$CATALINA_HOME/conf/logging.properties"
 
-# do not write log files, log everything to the Docker daemon
-COPY --from=build /src/server-qm/config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
 ENV CATALINA_OUT=/dev/null
 
-COPY --from=build /src/server-qm/target/*.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=build \
+    /src/server-qm/target/*.war \
+    "$CATALINA_HOME/webapps/ROOT.war"
+
+EXPOSE 8080
diff --git a/src/server-rm/Dockerfile b/src/server-rm/Dockerfile
index 7441bc4c..e9e11226 100644
--- a/src/server-rm/Dockerfile
+++ b/src/server-rm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21-alpine AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25-alpine AS build
 
 WORKDIR /src
 
@@ -18,9 +18,9 @@ COPY server-rm/ server-rm/
 # Build only the specific module and its dependencies
 RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-rm -am
 
-FROM docker.io/library/jetty:12-jre21-eclipse-temurin
 
-# Add metadata
+FROM docker.io/library/jetty:12.1-jdk25-eclipse-temurin
+
 LABEL org.opencontainers.image.title="OSLC RefImpl RM Server"
 LABEL org.opencontainers.image.description="OSLC Requirements Management Reference Implementation"
 LABEL org.opencontainers.image.source="https://github.com/oslc-op/refimpl"
@@ -32,6 +32,15 @@ LABEL org.opencontainers.image.licenses="EPL-2.0"
 
 COPY --from=build /src/server-rm/target/*.war /var/lib/jetty/webapps/ROOT.war
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl
+RUN rm -f "$JETTY_BASE/start.d/threadpool.ini" && \
+    java -jar "$JETTY_HOME/start.jar" \
+      --add-modules=ee10-deploy,ee10-jsp,ee10-jstl,threadpool-virtual && \
+    printf '%s\n' \
+      'jetty.threadPool.minThreads=8' \
+      'jetty.threadPool.maxThreads=64' \
+      'jetty.threadPool.reservedThreads=-1' \
+      'jetty.threadPool.virtual.maxConcurrentTasks=500' \
+      'jetty.threadPool.virtual.tracking=false' \
+      >> "$JETTY_BASE/start.d/threadpool-virtual.ini"
 
 EXPOSE 8080
diff --git a/src/server-rm/tomcat.Dockerfile b/src/server-rm/tomcat.Dockerfile
index 431f8048..5e22dfe1 100644
--- a/src/server-rm/tomcat.Dockerfile
+++ b/src/server-rm/tomcat.Dockerfile
@@ -1,13 +1,34 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21 AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25 AS build
 
 COPY . /src
 WORKDIR /src
-RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-rm -am -Pwith-jstl-impl
 
-FROM docker.io/library/tomcat:10-jre25
+RUN mvn -B --no-transfer-progress \
+    -DskipTests \
+    clean package \
+    -pl server-rm \
+    -am \
+    -Pwith-jstl-impl
+
+
+FROM docker.io/library/tomcat:10.1-jre25-temurin
+
+# Enable virtual threads for requests handled by the default HTTP connector.
+RUN sed -i \
+      's|<Connector port="8080" protocol="HTTP/1.1"|<Connector port="8080" protocol="HTTP/1.1" useVirtualThreads="true"|' \
+      "$CATALINA_HOME/conf/server.xml" && \
+    grep -q 'useVirtualThreads="true"' \
+      "$CATALINA_HOME/conf/server.xml"
+
+# Do not write catalina.out; log through the container runtime.
+COPY --from=build \
+    /src/server-rm/config/tomcat-log.properties \
+    "$CATALINA_HOME/conf/logging.properties"
 
-# do not write log files, log everything to the Docker daemon
-COPY --from=build /src/server-rm/config/tomcat-log.properties $CATALINA_BASE/conf/logging.properties
 ENV CATALINA_OUT=/dev/null
 
-COPY --from=build /src/server-rm/target/*.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=build \
+    /src/server-rm/target/*.war \
+    "$CATALINA_HOME/webapps/ROOT.war"
+
+EXPOSE 8080