diff --git a/config/revapi.json b/config/revapi.json
index cddd4fc1ccc..e64c399a615 100644
--- a/config/revapi.json
+++ b/config/revapi.json
@@ -1,23 +1,4 @@
 [
-  {
-    "extension": "revapi.versions",
-    "configuration": {
-      "enabled": true,
-      "semantic0": true,
-      "strictSemver": true,
-      "versionIncreaseAllows": {
-        "major": {
-          "severity": "BREAKING"
-        },
-        "minor": {
-          "severity": "NON_BREAKING"
-        },
-        "patch": {
-          "severity": "EQUIVALENT"
-        }
-      }
-    }
-  },
   {
     "extension": "revapi.filter",
     "configuration": {
@@ -31,47 +12,20 @@
             "matcher": "java",
             "match": "@dev.morphia.annotations.internal.MorphiaExperimental ^*;"
           },
-          {
-            "matcher": "java",
-            "match": "class dev.morphia.sofia.Sofia {}"
-          },
-          {
-            "matcher": "java",
-            "match": "type ^* implements com.mongodb.session.ClientSession {}"
-          },
-          {
-            "matcher": "java-package",
-            "match": "/.*codec.*/"
-          },
-          {
-            "matcher": "java-package",
-            "match": "/com.mongodb.*/"
-          },
-          {
-            "matcher": "java-package",
-            "match": "/org.bson.*/"
-          },
           {
             "matcher": "java-package",
-            "match": "/.*internal.*/"
+            "match": "/.*\\.internal(\\..*)?/"
           },
           {
             "matcher": "java-package",
-            "match": "/.*experimental.*/"
+            "match": "/.*\\.experimental(\\..*)?/"
           },
           {
             "matcher": "java-package",
-            "match": "dev.morphia.annotations.internal"
+            "match": "/.*codec.*/"
           }
         ]
       }
     }
-  },
-  {
-    "extension": "revapi.differences",
-    "configuration": {
-      "ignore": true,
-      "differences": []
-    }
   }
-]
\ No newline at end of file
+]
diff --git a/core/pom.xml b/core/pom.xml
index c9f9312b04b..dcbe030961f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -249,9 +249,29 @@
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-maven-plugin</artifactId>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>audits</id>
+            <activation>
+                <property>
+                    <name>audits</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.revapi</groupId>
                         <artifactId>revapi-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>api-check</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/pom.xml b/pom.xml
index 75e4f2ab105..d5902cf16dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,19 +109,9 @@
                             <version>${revapi.java.version}</version>
                         </dependency>
                     </dependencies>
-                    <executions>
-                        <execution>
-                            <id>revapi</id>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
                     <configuration>
-                        <failBuildOnProblemsFound>true</failBuildOnProblemsFound>
                         <analysisConfigurationFiles>
-                            <analysisConfigurationFile>${maven.multiModuleProjectDirectory}/config/revapi.json</analysisConfigurationFile>
+                            <file>${maven.multiModuleProjectDirectory}/config/revapi.json</file>
                         </analysisConfigurationFiles>
                     </configuration>
                 </plugin>