diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8fdca81810..4e9e51f094 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
         export FIREFOX_BIN=$(which firefox)
         export SELENIUM_BROWSER=firefox
 
-        mvn -B -P!standard-with-extra-repos -U -Djetty -e clean install
+        mvn -B -P!standard-with-extra-repos -U -Dtomcat -e clean install
         mvn -P!standard-with-extra-repos -B javadoc:javadoc javadoc:test-javadoc -T1C
     - name: Login to Docker Hub
       if: contains('refs/heads/2022.06.x refs/heads/2023.06.x refs/heads/2024.06.x refs/heads/2025.06.x refs/heads/2025.12.x refs/heads/main', github.ref) && github.event_name=='push' && success()
diff --git a/Dockerfile b/Dockerfile
index a373c9172d..653d644d9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:10-jdk21-temurin-jammy
+FROM tomcat:11-jdk21-temurin-jammy
 RUN groupadd -r mcr -g 501 && \
     useradd -d /home/mcr -u 501 -m -s /bin/bash -g mcr mcr
 WORKDIR /usr/local/tomcat/
diff --git a/mir-it/src/test/integration/mycore.properties b/mir-it/src/test/integration/mycore.properties
index 29f278b0da..c122bdcd3c 100644
--- a/mir-it/src/test/integration/mycore.properties
+++ b/mir-it/src/test/integration/mycore.properties
@@ -1,5 +1,6 @@
 MCR.Solr.ServerURL=http\://localhost\:${solr.port}/
 MCR.Solr.DelayIndexing_inMS=200
+MCR.Solr.SolrClient.SocketTimeout=70000
 
 MCR.Solr.Server.Auth.Admin.Class=org.mycore.solr.auth.MCRSolrPropertyBasicAuthenticator
 MCR.Solr.Server.Auth.Admin.Password=alleswirdgut
diff --git a/mir-webapp/src/main/solr/Dockerfile b/mir-webapp/src/main/solr/Dockerfile
index 52b1ee29ed..0c8cc3f6be 100644
--- a/mir-webapp/src/main/solr/Dockerfile
+++ b/mir-webapp/src/main/solr/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:9.7
+FROM solr:9.10
 USER root
 RUN apt-get update && \
     apt-get -y install sudo
diff --git a/pom.xml b/pom.xml
index 495fd365fc..99da77c415 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.mycore</groupId>
     <artifactId>mycore-parent</artifactId>
-    <version>58</version>
+    <version>59-SNAPSHOT</version>
   </parent>
   <groupId>org.mycore.mir</groupId>
   <artifactId>mir-parent</artifactId>
@@ -41,18 +41,18 @@
     <!-- until snapshot matches released version (required for 'mvn changes:changes-check') -->
     <changes.version>2025.02</changes.version>
     <java.target.version>21</java.target.version>
-    <jetty.version>12.0.14</jetty.version>
+    <jetty.version>12.1.6</jetty.version>
     <maven.compiler.arg>-Werror</maven.compiler.arg>
     <mycore.version>2026.06.0-SNAPSHOT</mycore.version>
     <pmd.failOnViolation>true</pmd.failOnViolation>
     <pmd.version>7.11.0</pmd.version>
     <selenium.version>4.23.0</selenium.version>
     <site.suffix />
-    <solr-runner.solrVersionString>9.7.0</solr-runner.solrVersionString>
+    <solr-runner.solrVersionString>9.10.1</solr-runner.solrVersionString>
     <sortpom.sortDeps>scope,groupId,artifactId</sortpom.sortDeps>
     <sortpom.sortFile>https://gist.githubusercontent.com/yagee-de/dfd3698c1b49173dbf251f74eb6a9297/raw/406460c088ff3cb6354e4ae6b40535e6f841607d/mycore_sort.xml</sortpom.sortFile>
     <sortpom.sortProps>true</sortpom.sortProps>
-    <tomcat.version>10.1.31</tomcat.version>
+    <tomcat.version>11.0.18</tomcat.version>
   </properties>
   <build>
     <pluginManagement>