diff --git a/maven-modules/maven-plugins/pom.xml b/maven-modules/maven-plugins/pom.xml
index 43bcf1f422..4877f00a92 100644
--- a/maven-modules/maven-plugins/pom.xml
+++ b/maven-modules/maven-plugins/pom.xml
@@ -14,6 +14,11 @@
         <relativePath>../..</relativePath>
     </parent>
 
+    <modules>
+        <!--<module>custom-rule</module>--> <!-- Fixing in JAVA-2819 -->
+        <module>maven-enforcer</module>
+    </modules>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 99fde0daf4..ee7b80ffc1 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -43,6 +43,7 @@
         <module>spring-cloud-ribbon-retry</module>
         <module>spring-cloud-circuit-breaker</module>
         <module>spring-cloud-eureka-self-preservation</module>
+        <!--<module>spring-cloud-openfeign</module>--> <!-- Fixing in JAVA-2820 -->
     </modules>
 
     <build>