diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml
index e4c80c896..2c6d5454b 100644
--- a/module-snapshot-publishing.yml
+++ b/module-snapshot-publishing.yml
@@ -7,6 +7,24 @@ trigger:
 
 pr: none
 
+strategy:
+  matrix:
+#    dstu2:
+#      module: "org.hl7.fhir.dstu2"
+#    dstu3:
+#      module: "org.hl7.fhir.dstu3"
+#    dstu2016may:
+#      module: "org.hl7.fhir.dstu2016may"
+#    r4:
+#      module: "org.hl7.fhir.r4"
+    r5:
+      module: "org.hl7.fhir.r5"
+#    validator:
+#      module: "org.hl7.fhir.validation"
+#    validator_cli:
+#      module: "org.hl7.fhir.validation.cli"
+  maxParallel: 3
+
 pool:
   vmImage: "ubuntu-16.04"
 
@@ -14,6 +32,9 @@ variables:
   currentModule: $(module)
 
 steps:
+  # Debugging output to identify current module.
+  - bash: echo Publishing SNAPSHOT for $(module)
+    displayName: 'Print module name.'
 
   # Signing, for now, occurs for all builds, SNAPSHOT or release. So we need a valid
   # signing key. The next two steps download the public and private keys from the
@@ -83,9 +104,9 @@ steps:
   # Deploy the SNAPSHOT artifact to sonatype nexus.
   # This is done for the master branch merges only.
   - task: Maven@3
-    displayName: 'Deploying SNAPSHOTS to Sonatype staging'
+    displayName: 'Deploy $(module) to Sonatype staging'
     inputs:
-      mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
+      mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml'
       goals: clean deploy
       options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X'
       publishJUnitResults: false
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index c283438cf..c594215d8 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -13,12 +13,13 @@
 	<packaging>bundle</packaging>
 
 	<dependencies>
-
 		<!-- HAPI Dependencies -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
+			<version>${project.version}</version>
 		</dependency>
+
 		<dependency>
 		 <groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-base</artifactId>
diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml
index 7b4849c3a..f22730c90 100644
--- a/org.hl7.fhir.report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@@ -12,7 +12,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.hl7.fhir.report</artifactId>
-
     <packaging>bundle</packaging>
 
     <properties>
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index c2f9701ce..802120eb6 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -13,7 +13,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index 1fd0d94b9..234ed6fc1 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -23,6 +23,7 @@
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
         </dependency>
+
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>org.hl7.fhir.utilities</artifactId>
diff --git a/pom.xml b/pom.xml
index 924cdf3b2..7c17cfcd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,20 @@
         <url>http://hl7.org</url>
     </organization>
 
+    <modules>
+        <module>org.hl7.fhir.utilities</module>
+        <module>org.hl7.fhir.dstu2</module>
+        <module>org.hl7.fhir.dstu2016may</module>
+        <module>org.hl7.fhir.dstu3</module>
+        <module>org.hl7.fhir.r4</module>
+        <module>org.hl7.fhir.r5</module>
+        <module>org.hl7.fhir.convertors</module>
+        <module>org.hl7.fhir.validation</module>
+        <module>org.hl7.fhir.validation.cli</module>
+        <!-- The report project exists only to aggregate the test results from the other projects into a central report. -->
+        <module>org.hl7.fhir.report</module>
+    </modules>
+
     <repositories>
         <repository>
             <snapshots>
@@ -122,21 +136,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>org.hl7.fhir.utilities</module>
-        <module>org.hl7.fhir.dstu2</module>
-        <module>org.hl7.fhir.dstu2016may</module>
-        <module>org.hl7.fhir.dstu3</module>
-        <module>org.hl7.fhir.r4</module>
-        <module>org.hl7.fhir.r5</module>
-        <module>org.hl7.fhir.convertors</module>
-        <module>org.hl7.fhir.validation</module>
-        <module>org.hl7.fhir.validation.cli</module>
-        <!-- The report project exists only to aggregate the test results from the other projects into a central report. -->
-        <module>org.hl7.fhir.report</module>
-    </modules>
-
-
     <build>
         <plugins>
             <plugin>