diff --git a/hapi-fhir-checkstyle/src/main/java/ca/uhn/fhir/checks/HapiErrorCodeCheck.java b/hapi-fhir-checkstyle/src/main/java/ca/uhn/fhir/checks/HapiErrorCodeCheck.java
index 8494b29e4ff..60b1cacf187 100644
--- a/hapi-fhir-checkstyle/src/main/java/ca/uhn/fhir/checks/HapiErrorCodeCheck.java
+++ b/hapi-fhir-checkstyle/src/main/java/ca/uhn/fhir/checks/HapiErrorCodeCheck.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * mvn -P CI,ALLMODULES checkstyle:check
+ * mvn -P CI checkstyle:check
  */
 @StatelessCheck
 public final class HapiErrorCodeCheck extends AbstractCheck {
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/appendix/faq.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/appendix/faq.md
index eda0434ec2b..eb3697b9967 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/appendix/faq.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/appendix/faq.md
@@ -41,7 +41,7 @@ Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:tes
 This typically means that your build is running out of memory. HAPI's unit tests execute by default in multiple threads (the thread count is determined by the number of CPU cores available) so in an environment with lots of cores but not enough RAM, you may run out. If you are getting this error, try executing the build with the following arguments:
 
 ```
-mvn -P ALLMODULES,NOPARALLEL install
+mvn -P NOPARALLEL install
 ```
 
 See [Hacking HAPI FHIR](/docs/contributing/hacking_guide.html) for more information on the build process.
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/contributing/hacking_guide.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/contributing/hacking_guide.md
index b616f4ceff7..f1ad41ae49e 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/contributing/hacking_guide.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/contributing/hacking_guide.md
@@ -66,7 +66,7 @@ If the build fails to execute successfully, try the following:
 * If the build fails with memory issues (or mysteriously dies during unit tests), your build environment may be running out of memory. By default, the HAPI build executes unit tests in multiple parallel JVMs in order to save time. This can consume a lot of RAM and sometimes causes issues. Try executing with the following command to disable this behaviour:
 
    ```bash
-   mvn -P ALLMODULES,NOPARALLEL install
+   mvn -P NOPARALLEL install
    ```
    
  * If you figure something else out, please <b>let us know</b> so that we can add it to this list!
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
index d43c4d57588..f5efb715ded 100644
--- a/hapi-fhir-jacoco/pom.xml
+++ b/hapi-fhir-jacoco/pom.xml
@@ -17,180 +17,181 @@
 
 	<artifactId>hapi-fhir-jacoco</artifactId>
 	<packaging>jar</packaging>
-
 	<name>HAPI FHIR - JaCoCo Test Coverage</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server-mdm</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server-openapi</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu2</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-dstu3</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-r4</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-r5</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-validation</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-base</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-utilities</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-dstu2</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-dstu3</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-r4</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-r4b</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-r5</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- TODO KHS temporarily disable these tests because they are blocking ci
-
-<dependency>
-<groupId>ca.uhn.hapi.fhir</groupId>
-<artifactId>hapi-fhir-jpaserver-elastic-test-utilities</artifactId>
-<version>${project.version}</version>
-</dependency>
--->
-
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-client-okhttp</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-subscription</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-searchparam</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-model</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-mdm</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-storage</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-	<properties>
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>post-integration-test</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>report-aggregate</goal>
-						</goals>
+	<profiles>
+		<profile>
+			<id>JACOCO</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>post-integration-test</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>report-aggregate</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.reporting.outputDirectory}/jacoco-report</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
 						<configuration>
-							<outputDirectory>${project.reporting.outputDirectory}/jacoco-report</outputDirectory>
+							<skip>true</skip>
 						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-base</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-server</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-server-mdm</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-server-openapi</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-client</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu2</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-dstu3</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-r4</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-r5</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-validation</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-base</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-test-utilities</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-test-dstu2</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-test-dstu3</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-test-r4</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-test-r4b</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-test-r5</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<!-- TODO KHS temporarily disable these tests because they are blocking ci -->
+				<!--
+								<dependency>
+									<groupId>ca.uhn.hapi.fhir</groupId>
+									<artifactId>hapi-fhir-jpaserver-elastic-test-utilities</artifactId>
+									<version>${project.version}</version>
+								</dependency>
+				-->
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-client-okhttp</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-subscription</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-searchparam</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-model</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-jpaserver-mdm</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-storage</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>
diff --git a/lgtm.yml b/lgtm.yml
index c43e5aa14ab..42a03ea9ed0 100644
--- a/lgtm.yml
+++ b/lgtm.yml
@@ -6,5 +6,5 @@ extraction:
       maven: 
         version: 3.8.4
       build_command:
-        - mvn -P ALLMODULES,LGTM -Dmaven.test.skip install
+         - mvn -P LGTM -Dmaven.test.skip install
 
diff --git a/pom.xml b/pom.xml
index be98dd3f52a..8eadeea9c1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,68 @@
 		</repository>
 	</repositories>
 
+	<modules>
+		<module>hapi-fhir-checkstyle</module>
+		<module>hapi-fhir-bom</module>
+		<module>hapi-deployable-pom</module>
+		<module>hapi-fhir-base</module>
+		<module>hapi-fhir-docs</module>
+		<module>hapi-fhir-test-utilities</module>
+		<module>hapi-fhir-jpaserver-test-utilities</module>
+		<module>hapi-fhir-jpaserver-test-dstu2</module>
+		<module>hapi-fhir-jpaserver-test-dstu3</module>
+		<module>hapi-fhir-jpaserver-test-r4</module>
+		<module>hapi-fhir-jpaserver-test-r4b</module>
+		<module>hapi-fhir-jpaserver-test-r5</module>
+		<module>hapi-fhir-jpaserver-elastic-test-utilities</module>
+		<module>hapi-tinder-plugin</module>
+		<module>hapi-tinder-test</module>
+		<module>hapi-fhir-client</module>
+		<module>hapi-fhir-server</module>
+		<module>hapi-fhir-server-mdm</module>
+		<module>hapi-fhir-server-openapi</module>
+		<module>hapi-fhir-converter</module>
+		<module>hapi-fhir-validation</module>
+		<module>hapi-fhir-structures-dstu2</module>
+		<module>hapi-fhir-structures-hl7org-dstu2</module>
+		<module>hapi-fhir-validation-resources-dstu2</module>
+		<module>hapi-fhir-structures-dstu2.1</module>
+		<module>hapi-fhir-validation-resources-dstu2.1</module>
+		<module>hapi-fhir-structures-dstu3</module>
+		<module>hapi-fhir-validation-resources-dstu3</module>
+		<module>hapi-fhir-structures-r4</module>
+		<module>hapi-fhir-validation-resources-r4</module>
+		<module>hapi-fhir-structures-r4b</module>
+		<module>hapi-fhir-structures-r5</module>
+		<module>hapi-fhir-validation-resources-r5</module>
+		<module>hapi-fhir-jpa</module>
+		<module>hapi-fhir-storage</module>
+		<module>hapi-fhir-storage-batch2</module>
+		<module>hapi-fhir-storage-batch2-jobs</module>
+		<module>hapi-fhir-storage-mdm</module>
+		<module>hapi-fhir-storage-test-utilities</module>
+		<module>hapi-fhir-jpaserver-cql</module>
+		<module>hapi-fhir-jpaserver-model</module>
+		<module>hapi-fhir-jpaserver-searchparam</module>
+		<module>hapi-fhir-jpaserver-subscription</module>
+		<module>hapi-fhir-jaxrsserver-base</module>
+		<module>hapi-fhir-batch</module>
+		<module>hapi-fhir-jpaserver-base</module>
+		<module>hapi-fhir-sql-migrate</module>
+		<module>hapi-fhir-jpaserver-mdm</module>
+		<module>hapi-fhir-testpage-overlay</module>
+		<module>hapi-fhir-jpaserver-uhnfhirtest</module>
+		<module>hapi-fhir-client-okhttp</module>
+		<module>hapi-fhir-android</module>
+		<module>hapi-fhir-cli</module>
+		<module>hapi-fhir-dist</module>
+		<module>tests/hapi-fhir-base-test-jaxrsserver-kotlin</module>
+		<module>tests/hapi-fhir-base-test-mindeps-client</module>
+		<module>tests/hapi-fhir-base-test-mindeps-server</module>
+		<module>hapi-fhir-spring-boot</module>
+		<module>hapi-fhir-jacoco</module>
+	</modules>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -846,34 +908,37 @@
 		  <spring_data_bom_version>2021.2.2</spring_data_bom_version>
 		  <spring_batch_version>4.3.3</spring_batch_version>
         <spring_boot_version>2.7.4</spring_boot_version>
-        <spring_retry_version>1.2.2.RELEASE</spring_retry_version>
+		 <spring_retry_version>1.2.2.RELEASE</spring_retry_version>
 
-        <stax2_api_version>3.1.4</stax2_api_version>
-        <testcontainers_version>1.17.1</testcontainers_version>
-        <thymeleaf-version>3.0.14.RELEASE</thymeleaf-version>
-        <woodstox_core_asl_version>4.4.1</woodstox_core_asl_version>
+		 <stax2_api_version>3.1.4</stax2_api_version>
+		 <testcontainers_version>1.17.1</testcontainers_version>
+		 <thymeleaf-version>3.0.14.RELEASE</thymeleaf-version>
+		 <woodstox_core_asl_version>4.4.1</woodstox_core_asl_version>
 
-        <!-- We are aiming to still work on a very old version of SLF4j even though we depend on the newest, just to be nice to users of the API. This version is tested in the hapi-fhir-cobertura. -->
-        <slf4j_target_version>1.6.0</slf4j_target_version>
+		 <!-- We are aiming to still work on a very old version of SLF4j even though we depend on the newest, just to be nice to users of the API. This version is tested in the hapi-fhir-cobertura. -->
+		 <slf4j_target_version>1.6.0</slf4j_target_version>
 
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
+		 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		 <ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
 
-        <elastic_apm_version>1.28.4</elastic_apm_version>
-        <!-- CQL Support -->
-        <cql-engine.version>1.5.1</cql-engine.version>
-        <cql-evaluator.version>1.2.0</cql-evaluator.version>
-        <cqframework.version>1.5.2</cqframework.version>
+		 <elastic_apm_version>1.28.4</elastic_apm_version>
+		 <!-- CQL Support -->
+		 <cql-engine.version>1.5.1</cql-engine.version>
+		 <cql-evaluator.version>1.2.0</cql-evaluator.version>
+		 <cqframework.version>1.5.2</cqframework.version>
 
-        <!-- Site properties -->
-        <fontawesomeVersion>5.4.1</fontawesomeVersion>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-		  <maven.compiler.release>11</maven.compiler.release>
-        <maven.compiler.testSource>17</maven.compiler.testSource>
-		  <maven.compiler.testTarget>17</maven.compiler.testTarget>
-		  <maven.compiler.testRelease>17</maven.compiler.testRelease>
-    </properties>
+		 <!-- Site properties -->
+		 <fontawesomeVersion>5.4.1</fontawesomeVersion>
+		 <maven.compiler.source>11</maven.compiler.source>
+		 <maven.compiler.target>11</maven.compiler.target>
+		 <maven.compiler.release>11</maven.compiler.release>
+		 <maven.compiler.testSource>17</maven.compiler.testSource>
+		 <maven.compiler.testTarget>17</maven.compiler.testTarget>
+		 <maven.compiler.testRelease>17</maven.compiler.testRelease>
+
+		 <!-- Jacoco -->
+		 <argLine></argLine>
+	 </properties>
 
 	<dependencyManagement>
 		<dependencies>
@@ -2594,21 +2659,24 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-				</configuration>
-				<executions>
-					<execution>
-						<id>default-prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+			<!-- FIXME This activates jacoco all the time - need to add profile -->
+			<!--
+						<plugin>
+							<groupId>org.jacoco</groupId>
+							<artifactId>jacoco-maven-plugin</artifactId>
+							<configuration>
+								<dumpOnExit>true</dumpOnExit>
+							</configuration>
+							<executions>
+								<execution>
+									<id>default-prepare-agent</id>
+									<goals>
+										<goal>prepare-agent</goal>
+									</goals>
+								</execution>
+							</executions>
+						</plugin>
+			-->
 		</plugins>
 	</build>
 
@@ -2719,77 +2787,8 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>ALLMODULES</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>hapi-fhir-checkstyle</module>
-				<module>hapi-fhir-bom</module>
-				<module>hapi-deployable-pom</module>
-				<module>hapi-fhir-base</module>
-				<module>hapi-fhir-docs</module>
-				<module>hapi-fhir-test-utilities</module>
-				<module>hapi-fhir-jpaserver-test-utilities</module>
-				<module>hapi-fhir-jpaserver-test-dstu2</module>
-				<module>hapi-fhir-jpaserver-test-dstu3</module>
-				<module>hapi-fhir-jpaserver-test-r4</module>
-				<module>hapi-fhir-jpaserver-test-r4b</module>
-				<module>hapi-fhir-jpaserver-test-r5</module>
-				<module>hapi-fhir-jpaserver-elastic-test-utilities</module>
-				<module>hapi-tinder-plugin</module>
-				<module>hapi-tinder-test</module>
-				<module>hapi-fhir-client</module>
-				<module>hapi-fhir-server</module>
-				<module>hapi-fhir-server-mdm</module>
-				<module>hapi-fhir-server-openapi</module>
-				<module>hapi-fhir-converter</module>
-				<module>hapi-fhir-validation</module>
-				<module>hapi-fhir-structures-dstu2</module>
-				<module>hapi-fhir-structures-hl7org-dstu2</module>
-				<module>hapi-fhir-validation-resources-dstu2</module>
-				<module>hapi-fhir-structures-dstu2.1</module>
-				<module>hapi-fhir-validation-resources-dstu2.1</module>
-				<module>hapi-fhir-structures-dstu3</module>
-				<module>hapi-fhir-validation-resources-dstu3</module>
-				<module>hapi-fhir-structures-r4</module>
-				<module>hapi-fhir-validation-resources-r4</module>
-				<module>hapi-fhir-structures-r4b</module>
-				<module>hapi-fhir-structures-r5</module>
-				<module>hapi-fhir-validation-resources-r5</module>
-				<module>hapi-fhir-jpa</module>
-				<module>hapi-fhir-storage</module>
-				<module>hapi-fhir-storage-batch2</module>
-				<module>hapi-fhir-storage-batch2-jobs</module>
-				<module>hapi-fhir-storage-mdm</module>
-				<module>hapi-fhir-storage-test-utilities</module>
-				<module>hapi-fhir-jpaserver-cql</module>
-				<module>hapi-fhir-jpaserver-model</module>
-				<module>hapi-fhir-jpaserver-searchparam</module>
-				<module>hapi-fhir-jpaserver-subscription</module>
-				<module>hapi-fhir-jaxrsserver-base</module>
-				<module>hapi-fhir-batch</module>
-				<module>hapi-fhir-jpaserver-base</module>
-				<module>hapi-fhir-sql-migrate</module>
-				<module>hapi-fhir-jpaserver-mdm</module>
-				<module>hapi-fhir-testpage-overlay</module>
-				<module>hapi-fhir-jpaserver-uhnfhirtest</module>
-				<module>hapi-fhir-client-okhttp</module>
-				<module>hapi-fhir-android</module>
-				<module>hapi-fhir-cli</module>
-				<module>hapi-fhir-dist</module>
-				<module>tests/hapi-fhir-base-test-jaxrsserver-kotlin</module>
-				<module>tests/hapi-fhir-base-test-mindeps-client</module>
-				<module>tests/hapi-fhir-base-test-mindeps-server</module>
-				<module>hapi-fhir-spring-boot</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>JACOCO</id>
-			<modules>
-				<module>hapi-fhir-jacoco</module>
-			</modules>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/release-pipeline.yml b/release-pipeline.yml
index 867e95dda97..e92bfe448d2 100644
--- a/release-pipeline.yml
+++ b/release-pipeline.yml
@@ -170,7 +170,7 @@ jobs:
           inputs:
              goals: 'clean install'
              # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-             options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true'
+             options: '-P JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true'
              # These are JVM options (and don't show up in the build logs)
              mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
              jdkVersionOption: 1.11
diff --git a/snapshot-pipeline.yml b/snapshot-pipeline.yml
index 07946746b2e..09348482148 100644
--- a/snapshot-pipeline.yml
+++ b/snapshot-pipeline.yml
@@ -86,7 +86,7 @@ steps:
       JAVA_HOME_11_X64: /usr/java/openjdk-17
     displayName: 'Deploy to Sonatype staging'
     inputs:
-      mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
+       mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
       goals: deploy
-      options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -P DIST,ALLMODULES -DskipTests'
+       options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -P DIST -DskipTests'
       publishJUnitResults: false
diff --git a/test-job-template.yml b/test-job-template.yml
index 4cdfca24b69..be12ca37161 100644
--- a/test-job-template.yml
+++ b/test-job-template.yml
@@ -27,7 +27,7 @@ jobs:
             inputs:
                goals: 'install'
                # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-               options: '-P ALLMODULES,CI,FASTINSTALL -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true'
+               options: '-P CI,FASTINSTALL -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true'
                # These are JVM options (and don't show up in the build logs)
                mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
                jdkVersionOption: 1.11
@@ -60,7 +60,7 @@ jobs:
                   mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
                   goals: 'clean test jacoco:report -pl ${{ p.module }}'
                   # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-                  options: '-P ALLMODULES,JACOCO,CI -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true'
+                  options: '-P JACOCO,CI -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true'
                   # These are JVM options (and don't show up in the build logs)
                   mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
                   jdkVersionOption: 1.11
@@ -124,7 +124,7 @@ jobs:
                mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
                goals: 'jacoco:report-aggregate'
                # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-               options: '-P ALLMODULES,JACOCO'
+               options: '-P JACOCO'
                # These are JVM options (and don't show up in the build logs)
                mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
                jdkVersionOption: 1.11