diff --git a/.github/CI_VERSIONS.md b/.github/CI_VERSIONS.md
index 5a03756022..f3b089f9b4 100644
--- a/.github/CI_VERSIONS.md
+++ b/.github/CI_VERSIONS.md
@@ -5,7 +5,7 @@ file is the checklist of what needs periodic review and where each pin lives.
 
 | What | Version | Defined in | Notes |
 |------|---------|------------|-------|
-| Java (JDK) | `21` | `.github/actions/setup-java/action.yml` | Single source of truth for the CI JDK. Must match `maven.compiler.source`/`maven.compiler.target` in `pom.xml`. Review when the project adopts a new LTS. |
+| Java (JDK) | `25` | `.github/actions/setup-java/action.yml` | Single source of truth for the CI JDK. Must match `maven.compiler.source`/`maven.compiler.target` in `pom.xml` and the `openjfx.version` line. Review when the project adopts a new LTS. |
 | Elasticsearch | `8.11.2` | `.github/workflows/_integration-test.yml` and `services/save-and-restore/docker-compose.yml` | Service container for the save-and-restore integration tests. Update both files together. |
 
 ## Automatically maintained
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
index fa997d077e..f0684ca7fb 100644
--- a/.github/actions/setup-java/action.yml
+++ b/.github/actions/setup-java/action.yml
@@ -7,5 +7,5 @@ runs:
     - uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287
       with:
         distribution: temurin
-        java-version: '21'
+        java-version: '25'
         cache: maven
diff --git a/pom.xml b/pom.xml
index 28de983841..d1f5aaf1b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     <epics.version>7.0.11</epics.version>
     <epics.util.version>1.0.8</epics.util.version>
     <vtype.version>1.0.8</vtype.version>
-    <openjfx.version>21.0.7</openjfx.version>
+    <openjfx.version>25.0.4</openjfx.version>
     <!-- netscape.javascript jar for the JDK 26+ profiles; versioned separately
          from openjfx as it's only published for 25+. -->
     <jsobject.version>26.0.1</jsobject.version>
@@ -93,8 +93,8 @@
     <derby.version>10.16.1.1</derby.version>
     <jython.version>2.7.4b1</jython.version>
     <jgit.version>6.9.0.202403050737-r</jgit.version>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
+    <maven.compiler.source>25</maven.compiler.source>
+    <maven.compiler.target>25</maven.compiler.target>
     <activemq.client.version>5.18.4</activemq.client.version>
     <commons.compress.version>1.26.1</commons.compress.version>
     <spring.framework.version>5.3.22</spring.framework.version>
diff --git a/services/alarm-config-logger/pom.xml b/services/alarm-config-logger/pom.xml
index 825f0cc74f..1440567f65 100644
--- a/services/alarm-config-logger/pom.xml
+++ b/services/alarm-config-logger/pom.xml
@@ -6,7 +6,7 @@
     <version>6.0.0-SNAPSHOT</version>
   </parent>
   <properties>
-    <java.version>21</java.version>
+    <java.version>25</java.version>
     <!-- override root spring.boot.version for this module only -->
     <spring.boot.version>4.1.0</spring.boot.version>
   </properties>
diff --git a/services/alarm-logger/pom.xml b/services/alarm-logger/pom.xml
index 8f85792902..5110c376e3 100644
--- a/services/alarm-logger/pom.xml
+++ b/services/alarm-logger/pom.xml
@@ -6,7 +6,7 @@
     <version>6.0.0-SNAPSHOT</version>
   </parent>
   <properties>
-    <java.version>21</java.version>
+    <java.version>25</java.version>
     <!-- override root spring.boot.version for this module only -->
     <spring.boot.version>4.1.0</spring.boot.version>
   </properties>