diff --git a/.gitmodules b/.gitmodules
index ab79ccab656..5b8424ac4da 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,8 @@
     branch = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
-    url = https://github.com/xamarin/java.interop.git
-    branch = main
+    url = https://github.com/jonpryor/java.interop.git
+    branch = jonp-remove-jdk8-support
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
diff --git a/external/Java.Interop b/external/Java.Interop
index 8c9eece2b36..24f9b0fd85d 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 8c9eece2b3692f7d3b12dc0b39b4aa386bc6cc3d
+Subproject commit 24f9b0fd85df7e0bcbe622edc6a28477c5fc06f1