diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d51b789d04f859ab8906b094bfb76b825..ed7ac9137a6db851e2b2232a560402a0f1913328 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -7,22 +7,34 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<properties>
-				<gitlab-server>community-maven-via-job-token</gitlab-server>
+				<repo.releases.id>community-maven-repo</repo.releases.id>
+				<publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+				<publish.releases.id>community-maven-via-job-token</publish.releases.id>
+
+				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/21/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/21/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 
 		<profile>
 			<!-- This profile uses a personal token to authenticate, which is useful for local or manual runs. The
-			     presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
-			     based authentication -->
+           presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
+           based authentication -->
 			<id>GitLab-Authenticate-With-Private-Token</id>
 			<activation>
-			<property>
-				<name>env.COMMUNITY_MAVEN_TOKEN</name>
-			</property>
+				<property>
+					<name>env.COMMUNITY_MAVEN_TOKEN</name>
+				</property>
 			</activation>
 			<properties>
-				<gitlab-server>community-maven-via-private-token</gitlab-server>
+				<repo.releases.id>community-maven-repo</repo.releases.id>
+				<publish.snapshots.id>community-maven-via-private-token</publish.snapshots.id>
+				<publish.releases.id>community-maven-via-private-token</publish.releases.id>
+
+				<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+				<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/21/packages/maven</publish.snapshots.url>
+				<publish.releases.url>https://community.opengroup.org/api/v4/projects/21/packages/maven</publish.releases.url>
 			</properties>
 		</profile>
 	</profiles>
@@ -52,4 +64,4 @@
 			</configuration>
 		</server>
 	</servers>
-</settings>
+</settings>
\ No newline at end of file
diff --git a/crs-catalog-core/pom.xml b/crs-catalog-core/pom.xml
index 9d62e64ccd4d1c45fce8e4036b3a8006f0506f77..f25299af127d33936abb52eee645b50cd986fe8f 100644
--- a/crs-catalog-core/pom.xml
+++ b/crs-catalog-core/pom.xml
@@ -8,6 +8,7 @@
         <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
         <artifactId>crs-catalog-service</artifactId>
         <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
@@ -37,24 +38,6 @@
         <maven>3.1.0</maven>
     </prerequisites>
 
-    <repositories>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </repository>
-        <snapshotRepository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <dependencies>
         <!-- Compile/runtime dependencies -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 7dba8bb28c2a86ecf99ebe7d2a7e6ac74210caeb..5e0f2e27154ef9e7c399507707464f53d2de18b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,22 +45,41 @@
 
     <repositories>
         <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
+            <id>${repo.releases.id}</id>
+            <url>${repo.releases.url}</url>
         </repository>
     </repositories>
 
     <distributionManagement>
         <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
+            <id>${publish.releases.id}</id>
+            <url>${publish.releases.url}</url>
         </repository>
         <snapshotRepository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
+            <id>${publish.snapshots.id}</id>
+            <url>${publish.snapshots.url}</url>
         </snapshotRepository>
     </distributionManagement>
 
+    <profiles>
+        <profile>
+            <id>Default</id>
+            <activation>
+                <property>
+                    <name>!repo.releases.id</name>
+                </property>
+            </activation>
+            <properties>
+                <repo.releases.id>community-maven-repo</repo.releases.id>
+                <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+                <publish.releases.id>community-maven-via-job-token</publish.releases.id>
+                <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+                <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/21/packages/maven</publish.snapshots.url>
+                <publish.releases.url>https://community.opengroup.org/api/v4/projects/21/packages/maven</publish.releases.url>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/provider/crs-catalog-aws/pom.xml b/provider/crs-catalog-aws/pom.xml
index 66f619506cf26697d96f9c6e9cbf754810473435..843871b558dcd00872cb848297ba7fa9df6024a0 100644
--- a/provider/crs-catalog-aws/pom.xml
+++ b/provider/crs-catalog-aws/pom.xml
@@ -23,6 +23,7 @@
         <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
         <artifactId>crs-catalog-service</artifactId>
         <version>1.0.0</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
@@ -92,23 +93,4 @@
 
         </plugins>
     </build>
-
-    <repositories>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </repository>
-        <snapshotRepository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </snapshotRepository>
-    </distributionManagement>
-
 </project>
diff --git a/provider/crs-catalog-azure/crs-catalog-aks/pom.xml b/provider/crs-catalog-azure/crs-catalog-aks/pom.xml
index 8786c5feb7d6128412b0dafbfdca8c7f327d4bee..743db796ec1b513d7dac7116651265a2e844cf93 100644
--- a/provider/crs-catalog-azure/crs-catalog-aks/pom.xml
+++ b/provider/crs-catalog-azure/crs-catalog-aks/pom.xml
@@ -6,10 +6,11 @@
 
 
     <parent>
-		<groupId>org.opengroup.osdu.crs-catalog-service</groupId>
-		<artifactId>crs-catalog-service</artifactId>
-		<version>1.0.0</version>
-	</parent>
+        <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
+        <artifactId>crs-catalog-service</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
 
     <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
     <artifactId>crs-catalog-aks</artifactId>
@@ -18,24 +19,6 @@
     <name>crs-catalog-aks</name>
     <description>CRS Catalog service Google Kubernetes Engine deployment</description>
 
-    <repositories>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </repository>
-        <snapshotRepository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <properties>
         <app.version>1</app.version>
         <app.id>crs-catalog-aks</app.id>    
diff --git a/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml b/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml
index 78b743acdd2a6e9d3b0c0b4c29a4094d37dcd7cf..b7e9b389d4ba83755bccbc76126e336a4e804bdd 100644
--- a/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml
+++ b/provider/crs-catalog-gcp/crs-catalog-gke/pom.xml
@@ -9,6 +9,7 @@
         <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
         <artifactId>crs-catalog-service</artifactId>
         <version>1.0.0</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
@@ -18,24 +19,6 @@
     <name>crs-catalog-gke</name>
     <description>CRS Catalog service Google Kubernetes Engine deployment</description>
 
-    <repositories>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </repository>
-        <snapshotRepository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <properties>
         <app.version>1</app.version>
         <app.id>crs-catalog-gke</app.id>
@@ -154,7 +137,25 @@
                      -->
                 </configuration>
             </plugin>
-
+            <plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 
diff --git a/provider/crs-catalog-ibm/crs-catalog-ocp/pom.xml b/provider/crs-catalog-ibm/crs-catalog-ocp/pom.xml
index 9b13177b4ce6c364487a20b94b7d2228124bca48..5981d9f8fc2e7d0ff18a6e79bf1507c7d81e75fa 100644
--- a/provider/crs-catalog-ibm/crs-catalog-ocp/pom.xml
+++ b/provider/crs-catalog-ibm/crs-catalog-ocp/pom.xml
@@ -9,6 +9,7 @@
         <groupId>org.opengroup.osdu.crs-catalog-service</groupId>
         <artifactId>crs-catalog-service</artifactId>
         <version>1.0.0</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <packaging>jar</packaging>
@@ -16,24 +17,6 @@
     <name>crs-catalog-ocp</name>
     <description>CRS Catalog service Openshift Container Platform deployment</description>
 
-    <repositories>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </repository>
-        <snapshotRepository>
-            <id>${gitlab-server}</id>
-            <url>https://community.opengroup.org/api/v4/projects/21/packages/maven</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <properties>
         <app.version>1</app.version>
         <app.id>crs-catalog-ocp</app.id>