diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index bd39852c..909f930e 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -17,8 +17,8 @@ lto = true
 # Metadata for the OpenJDK repository
 [package.metadata.openjdk]
 # Our CI matches the following line and extract mmtk/openjdk. If this line is updated, please check ci yaml files and make sure it works.
-openjdk_repo = "https://github.com/mmtk/openjdk.git"
-openjdk_version = "28e56ee32525c32c5a88391d0b01f24e5cd16c0f"
+openjdk_repo = "https://github.com/qinsoon/openjdk.git"
+openjdk_version = "3a5a2f81106878156f5156eb87292c3f9a0d00e0"
 
 [dependencies]
 libc = "0.2"
diff --git a/openjdk/CompileThirdPartyHeap.gmk b/openjdk/CompileThirdPartyHeap.gmk
index 6897277a..9ffa968a 100644
--- a/openjdk/CompileThirdPartyHeap.gmk
+++ b/openjdk/CompileThirdPartyHeap.gmk
@@ -91,11 +91,10 @@ JVM_LDFLAGS += '-Wl,-rpath,$$ORIGIN'
 
 FORCE:
 
+THIRD_PARTY_HEAP_JVM_DEPS += $(LIB_MMTK)
 TARGETS += $(LIB_MMTK)
 JVM_SRC_DIRS += $(MMTK_CPP_ROOT) $(MMTK_CPP_ROOT)/barriers
 JVM_CFLAGS += -std=c++11 -DINCLUDE_THIRD_PARTY_HEAP -DTHIRD_PARTY_HEAP_SRC=$(MMTK_CPP_ROOT)
 ifeq ($(MMTK_VO_BIT), 1)
   JVM_CFLAGS += -DMMTK_ENABLE_VO_BIT
 endif
-
-$(BUILD_LIBJVM): $(LIB_MMTK)