diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index 3730502..a5a722c 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -5,10 +5,20 @@ discover:
 execute:
   how: tmt
 
+prepare:
+  - how: install
+    exclude:
+      # These subpackages pull in packaged versioned Java through their dependencies
+      - ant-antlr
+      - ant-apache-regexp
+      - ant-apache-resolver
+      - ant-apache-xalan2
+      - ant-junit5
+
 /jdk21:
   environment:
     OPENJDK_VERSION: 21
-  prepare:
+  prepare+:
     - how: install
       exclude:
         - ant-openjdk25
@@ -33,7 +43,7 @@ execute:
 /jdk25:
   environment:
     OPENJDK_VERSION: 25
-  prepare:
+  prepare+:
     - how: install
       exclude:
         - ant-openjdk21
@@ -56,17 +66,11 @@ execute:
           dnf -y remove java-*-openjdk
 
 /unbound:
-  prepare:
+  prepare+:
     - how: install
       exclude:
         - ant-openjdk21
         - ant-openjdk25
-        # These subpackages pull in packaged Java through their dependencies
-        - ant-antlr
-        - ant-apache-regexp
-        - ant-apache-resolver
-        - ant-apache-xalan2
-        - ant-junit5
 
   /jlink:
     summary: Ant matrix tests - unbound jlink-based Java
@@ -76,7 +80,7 @@ execute:
       - how: shell
         script: |
           test -d /opt/java && test -x /usr/local/bin/java && exit 0
-          dnf -y install java-21-openjdk-jmods
+          dnf -y install java-25-openjdk-jmods
           jlink --add-modules java.base,java.xml --output /opt/java
           ln -s /opt/java/bin/java /usr/local/bin/java
-          dnf -y remove java-21-openjdk-jmods
+          dnf -y remove java-25-openjdk-jmods