diff --git a/settings.gradle b/settings.gradle
index b353999f7c..f40e96ba3e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,7 +3,8 @@ include 'hibernate-testing'
 include 'hibernate-entitymanager'
 include 'hibernate-envers'
 
-include 'hibernate-osgi'
+// Temporarily disabled : HHH-9680
+//include 'hibernate-osgi'
 
 include 'hibernate-c3p0'
 include 'hibernate-proxool'
@@ -22,6 +23,7 @@ project(':metamodel-generator').name = 'hibernate-jpamodelgen'
 include 'hibernate-gradle-plugin'
 project(':hibernate-gradle-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-gradle-plugin")
 
+// Temporarily disabled : HHH-9679
 //include 'hibernate-enhance-maven-plugin'
 //project(':hibernate-enhance-maven-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-enhance-maven-plugin")