diff --git a/app/build.gradle b/app/build.gradle
index 2868e2f7..35eab5eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,10 +27,10 @@ def cache2kVersion = '1.2.4.Final'
 dependencies {
     implementation project(':atlas-web-core')
 
-    implementation 'org.springframework:spring-context:5.1.5.RELEASE'
-    implementation 'org.springframework:spring-web:5.1.5.RELEASE'
-    implementation 'org.springframework:spring-jdbc:5.1.5.RELEASE'
-    implementation 'org.springframework:spring-webmvc:5.1.5.RELEASE'
+    implementation 'org.springframework:spring-context:5.3.26'
+    implementation 'org.springframework:spring-web:5.3.26'
+    implementation 'org.springframework:spring-jdbc:5.3.26'
+    implementation 'org.springframework:spring-webmvc:5.3.26'
 
     implementation 'javax.validation:validation-api:2.0.1.Final'
     implementation 'commons-net:commons-net:3.8.0'
diff --git a/app/src/main/javascript/modules/experiments-summary-panel b/app/src/main/javascript/modules/experiments-summary-panel
index dec725bb..d88ce03c 160000
--- a/app/src/main/javascript/modules/experiments-summary-panel
+++ b/app/src/main/javascript/modules/experiments-summary-panel
@@ -1 +1 @@
-Subproject commit dec725bb9e336b90aeb4e459b9891f9a14fd7a73
+Subproject commit d88ce03cde100799d8f7a0d17cac67538aa1d13f
diff --git a/app/src/main/javascript/modules/species-summary-panel b/app/src/main/javascript/modules/species-summary-panel
index bd3b944e..b9edbdbb 160000
--- a/app/src/main/javascript/modules/species-summary-panel
+++ b/app/src/main/javascript/modules/species-summary-panel
@@ -1 +1 @@
-Subproject commit bd3b944e91e75600889f14e71a152aca2e9a91fb
+Subproject commit b9edbdbbcc661cc30d147818e8529f339f597f19
diff --git a/app/src/test/java/uk/ac/ebi/atlas/sitemaps/SitemapWriterIT.java b/app/src/test/java/uk/ac/ebi/atlas/sitemaps/SitemapWriterIT.java
index 3ec61908..0ec4d903 100644
--- a/app/src/test/java/uk/ac/ebi/atlas/sitemaps/SitemapWriterIT.java
+++ b/app/src/test/java/uk/ac/ebi/atlas/sitemaps/SitemapWriterIT.java
@@ -51,7 +51,7 @@ void producesValidXmlForMainSitemapOfSitemaps() throws Exception {
         var baos = new ByteArrayOutputStream();
         SitemapWriter.writeSitemapIndex(baos, randomSubsetOfSpecies);
 
-        assertThat(parseXml(baos).getDocumentElement()).hasFieldOrPropertyWithValue("tagName", "sitemapindex");
+        assertThat(parseXml(baos).getDocumentElement().getTagName()).isEqualTo("sitemapindex");
     }
 
     @Test
@@ -59,7 +59,7 @@ void producesValidXmlForExperiments() throws Exception {
         var baos = new ByteArrayOutputStream();
         SitemapWriter.writeExperimentsSitemap(baos);
 
-        assertThat(parseXml(baos).getDocumentElement()).hasFieldOrPropertyWithValue("tagName", "urlset");
+        assertThat(parseXml(baos).getDocumentElement().getTagName()).isEqualTo("urlset");
     }
 
     @Test
@@ -83,7 +83,7 @@ void producesValidXmlForBioentityIdentifiers() throws Exception {
         var baos = new ByteArrayOutputStream();
         SitemapWriter.writeBioentityIdentifiersSitemap(baos, ImmutableList.of(), true);
 
-        assertThat(parseXml(baos).getDocumentElement()).hasFieldOrPropertyWithValue("tagName", "urlset");
+        assertThat(parseXml(baos).getDocumentElement().getTagName()).isEqualTo( "urlset");
     }
 
     private Document parseXml(final ByteArrayOutputStream outputStream) throws Exception {
diff --git a/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle b/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle
index aafd45fb..ed5ddb60 100644
--- a/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle
@@ -6,8 +6,8 @@ plugins {
 group = 'uk.ac.ebi.ge'
 version = '1.0.0'
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 repositories {
   mavenCentral()
@@ -61,7 +61,7 @@ dependencies {
     exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
   }
 
-  testImplementation 'org.springframework:spring-test:5.1.5.RELEASE'
+  testImplementation 'org.springframework:spring-test:5.3.26'
   testImplementation 'com.h2database:h2:1.4.199'
   testImplementation 'org.junit.jupiter:junit-jupiter-params:5.4.1'
   testImplementation 'org.mockito:mockito-core:5.2.0'
diff --git a/docker/docker-compose-gradle-test.yml b/docker/docker-compose-gradle-test.yml
index 10e1383d..ef970436 100644
--- a/docker/docker-compose-gradle-test.yml
+++ b/docker/docker-compose-gradle-test.yml
@@ -2,7 +2,7 @@ version: "3.6"
 
 services:
   gxa-gradle:
-    image: gradle:7.0-jdk11
+    image: gradle:7.6.4-jdk17
     networks:
       - atlas-test-net
     ports:
diff --git a/docker/docker-compose-gradle.yml b/docker/docker-compose-gradle.yml
index 14ca342b..5469fd0b 100644
--- a/docker/docker-compose-gradle.yml
+++ b/docker/docker-compose-gradle.yml
@@ -2,7 +2,7 @@ version: "3.6"
 
 services:
   gxa-gradle:
-    image: gradle:7.0-jdk11
+    image: gradle:7.6.4-jdk17
     networks:
       - atlas-test-net
     volumes:
diff --git a/docker/docker-compose-tomcat.yml b/docker/docker-compose-tomcat.yml
index ce903f6a..bf4075ac 100644
--- a/docker/docker-compose-tomcat.yml
+++ b/docker/docker-compose-tomcat.yml
@@ -2,7 +2,7 @@ version: "3.6"
 
 services:
   gxa-tomcat:
-    image: tomcat:9-jdk11
+    image: tomcat:9-jdk17
     container_name: gxa-tomcat
     networks:
       - atlas-test-net
diff --git a/schemas b/schemas
index 56afadf5..80545112 160000
--- a/schemas
+++ b/schemas
@@ -1 +1 @@
-Subproject commit 56afadf592494610080ec7854cde34d18443c434
+Subproject commit 80545112bf373ccacfe46a53787aa07a4ef0b971