diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod
deleted file mode 100644
index 36fdb782f97..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Provides support for ALPN based on JDK 9+ APIs.
-
-[lib]
-lib/jetty-alpn-java-server-${jetty.version}.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod
deleted file mode 100644
index 4dbcf25f583..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[depend]
-alpn-impl/alpn-11
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod
deleted file mode 100644
index 4dbcf25f583..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[depend]
-alpn-impl/alpn-11
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod
deleted file mode 100644
index 4dbcf25f583..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[depend]
-alpn-impl/alpn-11
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod
deleted file mode 100644
index 4dbcf25f583..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[depend]
-alpn-impl/alpn-11
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-16.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-16.mod
deleted file mode 100644
index 4dbcf25f583..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-16.mod
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[depend]
-alpn-impl/alpn-11
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-java.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-java.mod
new file mode 100644
index 00000000000..9f52a8d0298
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-java.mod
@@ -0,0 +1,8 @@
+[description]
+Provides the ALPN implementation based on the Java APIs.
+
+[provides]
+alpn-impl|default
+
+[lib]
+lib/jetty-alpn-java-server-${jetty.version}.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
index eaa55ebe73a..dc45e13127f 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
@@ -8,10 +8,9 @@ internal
 
 [depend]
 ssl
-alpn-impl/alpn-${java.version.platform}
+alpn-impl
 
 [lib]
-lib/jetty-alpn-client-${jetty.version}.jar
 lib/jetty-alpn-server-${jetty.version}.jar
 
 [xml]
diff --git a/jetty-home/src/main/resources/modules/conscrypt.mod b/jetty-home/src/main/resources/modules/conscrypt.mod
index d39fe002efb..a61af57bd74 100644
--- a/jetty-home/src/main/resources/modules/conscrypt.mod
+++ b/jetty-home/src/main/resources/modules/conscrypt.mod
@@ -1,5 +1,3 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
 [description]
 Installs the Conscrypt JSSE provider.
 
@@ -29,6 +27,5 @@ Conscrypt is distributed under the Apache Licence 2.0
 https://github.com/google/conscrypt/blob/master/LICENSE
 
 [ini]
-conscrypt.version?=2.0.0
+conscrypt.version?=2.5.1
 jetty.sslContext.provider?=Conscrypt
-