diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml
index 338743faf..e591c3966 100644
--- a/.github/workflows/sonarscan.yml
+++ b/.github/workflows/sonarscan.yml
@@ -7,29 +7,12 @@ on:
   push:
     branches: [ main, feature/* ]
   pull_request_target:
-    branches: [ main, feature/* ]
+    branches: [ main, feature/* ] 
 
 jobs:
-  #test:
-    #name: Test - Unit and Integration
-    #runs-on: ubuntu-latest
-
-    #steps:
-      #- uses: actions/checkout@v4
-      #- name: Set up JDK 17
-       # uses: actions/setup-java@v4
-       # with:
-          #java-version: 17
-          #distribution: 'adopt'
-      #- name: Maven Package
-       # run: mvn -B clean package -DskipTests
-      #- name: Maven Verify
-        #run: mvn -B clean verify 
-
   sonar:
     name: Test - SonarCloud Scan
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
@@ -37,17 +20,11 @@ jobs:
         with:
           java-version: 17
           distribution: 'adopt' 
-      - name: Jacoco Scan 
-        run: |          
-              export MAVEN_OPTS="-Xmx10000m"
-              export NODE_OPTIONS="--max-old-space-size=4096"
-              mvn clean --settings server/wfprev-api/mvn_settings/settings.xml org.jacoco:jacoco-maven-plugin:0.8.12:prepare-agent -B verify org.jacoco:jacoco-maven-plugin:0.8.12:report -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} 
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: SonarCloud Scan 
         run: |          
             export MAVEN_OPTS="-Xmx10000m"
             export NODE_OPTIONS="--max-old-space-size=4096"
-            mvn clean --settings server/wfprev-api/mvn_settings/settings.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage,sonar -Dsonar.projectKey=bcgov_nr-bcws-wfprev -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }}
+            mvn clean --settings server/wfprev-api/mvn_settings/settings.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=bcgov_nr-bcws-wfprev -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }}
         env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index c41cc9e35..0f84cc9cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/target
\ No newline at end of file
+/target
+/.vscode
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8b5400e99..5f582c168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,91 +11,32 @@
 
     <modules>
         <module>server/wfprev-api</module>
-        <!-- <module>client</module> -->
+        <module>report-aggregate-module</module>
     </modules>
 
     <properties>
-        <sonar.version>3.10.0.2594</sonar.version>
-        <jacoco.version>0.8.11</jacoco.version>
-        <aggregate.report.dir>target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
+        <sonar.coverage.jacoco.xmlReportPaths>
+    ${project.basedir}/report-aggregate/target/site/
+      jacoco-aggregate/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${jacoco.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>${sonar.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.9</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>coverage</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>prepare-agent</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>sonar</id>
-            <properties>
-                <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-                <sonar.organization>bcgov-sonarcloud</sonar.organization>
-                <sonar.projectKey>bcgov_nr-bcws-wfprev</sonar.projectKey>
-                <sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
-                <sonar.report>${aggregate.report.dir}</sonar.report>
-            </properties>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>${argLine}</argLine>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonarsource.scanner.maven</groupId>
-                        <artifactId>sonar-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sonar</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sonar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
+    </project>
diff --git a/report-aggregate-module/.gitignore b/report-aggregate-module/.gitignore
new file mode 100644
index 000000000..c41cc9e35
--- /dev/null
+++ b/report-aggregate-module/.gitignore
@@ -0,0 +1 @@
+/target
\ No newline at end of file
diff --git a/report-aggregate-module/pom.xml b/report-aggregate-module/pom.xml
new file mode 100644
index 000000000..21dc59e19
--- /dev/null
+++ b/report-aggregate-module/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+		<groupId>ca.bc.gov.nrs.wfprev</groupId>
+		<artifactId>wfprev-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+    <groupId>ca.bc.gov.nrs</groupId>
+    <artifactId>generate-aggregate-report</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>WFPREV Aggregate Coverage Report</name>
+    <description>Aggregate Coverage Report</description>
+    <dependencies>
+        <dependency>
+            <groupId>ca.bc.gov.nrs</groupId>
+            <artifactId>wfprev-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>system</scope>
+            <systemPath>${basedir}\..\server\wfprev-api\target\wfprev-api-${project.parent.version}.war</systemPath>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.9</version>
+                <executions>
+                    <execution>
+                        <id>report-aggregate</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/server/wfprev-api/pom.xml b/server/wfprev-api/pom.xml
index 228062a61..677f09694 100644
--- a/server/wfprev-api/pom.xml
+++ b/server/wfprev-api/pom.xml
@@ -10,7 +10,7 @@
 		<!-- lookup parent from repository -->
 	</parent>
 	<groupId>ca.bc.gov.nrs</groupId>
-	<artifactId>wfprev</artifactId>
+	<artifactId>wfprev-api</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>wfprev-api</name>
@@ -30,8 +30,6 @@
 	</scm>
 	<properties>
 		<java.version>17</java.version>
-		<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}
-		</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
 	<dependencies>
 		<dependency>