diff --git a/pom.xml b/pom.xml
index 1719cb72..44e0a049 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,169 +1,184 @@
 <?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>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.5</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>au.org.aodn.ogcapi</groupId>
-	<artifactId>ogcapi-java</artifactId>
-	<version>0.0.0</version>
-	<name>ogcapi-java</name>
-	<packaging>pom</packaging>
+<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>
 
-	<description>REST API that implements OGC API</description>
-	<properties>
-		<java.version>17</java.version>
-		<springfox.version>3.0.0</springfox.version>
-		<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
-		<org.projectlombok.version>1.18.30</org.projectlombok.version>
-		<org.projectlombok.binding>0.2.0</org.projectlombok.binding>
-		<swagger.codegen.version>3.0.61</swagger.codegen.version>
-		<org.geotools.version>29.2</org.geotools.version>
-		<maven.deploy.skip>true</maven.deploy.skip>
-		<versioning.updatePom>true</versioning.updatePom>
-		<aws.sdk.version>2.29.52</aws.sdk.version>
-	</properties>
-	<repositories>
-		<repository>
-			<id>mvnrepository.com</id>
-			<url>https://repo1.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>repo.osgeo.org</id>
-			<url>https://repo.osgeo.org/repository/release/</url>
-		</repository>
-	</repositories>
-	<modules>
-		<module>common</module>
-		<module>coverages</module>
-		<module>features</module>
-		<module>maps</module>
-		<module>processes</module>
-		<module>tile</module>
-		<module>records</module>
-		<module>server</module>
-    </modules>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-				<version>2.8.8</version>
-			</dependency>
-			<dependency>
-				<groupId>com.github.joschi.jackson</groupId>
-				<artifactId>jackson-datatype-threetenbp</artifactId>
-				<version>2.6.4</version>
-			</dependency>
-			<!-- https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/getting-started-java.html-->
-			<dependency>
-				<groupId>co.elastic.clients</groupId>
-				<artifactId>elasticsearch-java</artifactId>
-				<version>8.13.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mapstruct</groupId>
-				<artifactId>mapstruct</artifactId>
-				<version>${org.mapstruct.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mapstruct</groupId>
-				<artifactId>mapstruct-processor</artifactId>
-				<version>${org.mapstruct.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok</artifactId>
-				<version>${org.projectlombok.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok-mapstruct-binding</artifactId>
-				<version>${org.projectlombok.binding}</version>
-			</dependency>
-			<!-- https://mvnrepository.com/artifact/org.geotools/gt-cql -->
-			<dependency>
-				<groupId>org.geotools</groupId>
-				<artifactId>gt-cql</artifactId>
-				<version>${org.geotools.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.geotools</groupId>
-				<artifactId>gt-geojson</artifactId>
-				<version>${org.geotools.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.geotools</groupId>
-				<artifactId>gt-referencing</artifactId>
-				<version>${org.geotools.version}</version>
-			</dependency>
-			<!--
-			https://mvnrepository.com/artifact/org.geotools/gt-epsg-hsql
-			it is use to lookup EPSG values
-			-->
-			<dependency>
-				<groupId>org.geotools</groupId>
-				<artifactId>gt-epsg-hsql</artifactId>
-				<version>22.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openapitools</groupId>
-				<artifactId>jackson-databind-nullable</artifactId>
-				<version>0.2.6</version>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>elasticsearch</artifactId>
-				<version>1.20.1</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.mock-server</groupId>
-				<artifactId>mockserver-netty</artifactId>
-				<version>5.15.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mock-server</groupId>
-				<artifactId>mockserver-client-java</artifactId>
-				<version>5.15.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.locationtech.spatial4j</groupId>
-				<artifactId>spatial4j</artifactId>
-				<version>0.8</version>
-			</dependency>
-			<dependency>
-				<groupId>software.amazon.awssdk</groupId>
-				<artifactId>batch</artifactId>
-				<version>${aws.sdk.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>software.amazon.awssdk</groupId>
-				<artifactId>auth</artifactId>
-				<version>${aws.sdk.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>software.amazon.awssdk</groupId>
-				<artifactId>ses</artifactId>
-				<version>${aws.sdk.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<distributionManagement>
-        <repository>
-            <id>codeartifact</id>
-            <name>codeartifact</name>
-            <url>${env.CODEARTIFACT_REPO_URL}</url>
-        </repository>
-        <snapshotRepository>
-            <id>codeartifact</id>
-            <name>codeartifact</name>
-            <url>${env.CODEARTIFACT_REPO_URL}</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>3.4.2</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>au.org.aodn.ogcapi</groupId>
+  <artifactId>ogcapi-java</artifactId>
+  <version>0.0.0</version>
+  <name>ogcapi-java</name>
+  <packaging>pom</packaging>
+  <description>REST API that implements OGC API</description>
+
+  <properties>
+    <java.version>17</java.version>
+    <springdoc.version>1.7.0</springdoc.version>
+    <springfox.version>3.0.0</springfox.version>
+    <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
+    <org.projectlombok.version>1.18.30</org.projectlombok.version>
+    <org.projectlombok.binding>0.2.0</org.projectlombok.binding>
+    <swagger.codegen.version>3.0.50</swagger.codegen.version>
+    <org.geotools.version>29.2</org.geotools.version>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <versioning.updatePom>true</versioning.updatePom>
+    <aws.sdk.version>2.29.52</aws.sdk.version>
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>mvnrepository.com</id>
+      <url>https://repo1.maven.org/maven2/</url>
+    </repository>
+    <repository>
+      <id>repo.osgeo.org</id>
+      <url>https://repo.osgeo.org/repository/release/</url>
+    </repository>
+    <repository>
+      <id>codeartifact</id>
+      <url>https://central-aodn-org-au-851725428481.d.codeartifact.ap-southeast-2.amazonaws.com/maven/maven-aodn-store/</url>
+    </repository>
+  </repositories>
+
+  <modules>
+    <module>common</module>
+    <module>coverages</module>
+    <module>features</module>
+    <module>maps</module>
+    <module>processes</module>
+    <module>tile</module>
+    <module>records</module>
+    <module>server</module>
+  </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springdoc</groupId>
+        <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+        <version>2.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.joschi.jackson</groupId>
+        <artifactId>jackson-datatype-threetenbp</artifactId>
+        <version>2.6.4</version>
+      </dependency>
+      <dependency>
+        <groupId>co.elastic.clients</groupId>
+        <artifactId>elasticsearch-java</artifactId>
+        <version>8.13.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct</artifactId>
+        <version>${org.mapstruct.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct-processor</artifactId>
+        <version>${org.mapstruct.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <version>${org.projectlombok.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok-mapstruct-binding</artifactId>
+        <version>${org.projectlombok.binding}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-cql</artifactId>
+        <version>${org.geotools.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-geojson</artifactId>
+        <version>${org.geotools.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-referencing</artifactId>
+        <version>${org.geotools.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-epsg-hsql</artifactId>
+        <version>22.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.openapitools</groupId>
+        <artifactId>jackson-databind-nullable</artifactId>
+        <version>0.2.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>elasticsearch</artifactId>
+        <version>1.20.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mock-server</groupId>
+        <artifactId>mockserver-netty</artifactId>
+        <version>5.15.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mock-server</groupId>
+        <artifactId>mockserver-client-java</artifactId>
+        <version>5.15.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.locationtech.spatial4j</groupId>
+        <artifactId>spatial4j</artifactId>
+        <version>0.8</version>
+      </dependency>
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>batch</artifactId>
+        <version>${aws.sdk.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>auth</artifactId>
+        <version>${aws.sdk.version}</version>
+      </dependency>
+	  <dependency>
+        <groupId>au.org.aodn</groupId>
+        <artifactId>es-indexer</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>ses</artifactId>
+        <version>${aws.sdk.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>au.org.aodn</groupId>
+        <artifactId>es-indexer</artifactId>
+        <version>0.0.40</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <distributionManagement>
+    <repository>
+      <id>codeartifact</id>
+      <name>codeartifact</name>
+      <url>${env.CODEARTIFACT_REPO_URL}</url>
+    </repository>
+    <snapshotRepository>
+      <id>codeartifact</id>
+      <name>codeartifact</name>
+      <url>${env.CODEARTIFACT_REPO_URL}</url>
+    </snapshotRepository>
+  </distributionManagement>
 </project>
diff --git a/server/pom.xml b/server/pom.xml
index 18fe69b4..b4377b50 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -2,12 +2,14 @@
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
         <artifactId>ogcapi-java</artifactId>
         <groupId>au.org.aodn.ogcapi</groupId>
         <version>0.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <name>ogcapi-server-java</name>
     <artifactId>ogcapi-java-server</artifactId>
@@ -19,6 +21,20 @@
         <maven.deploy.skip>false</maven.deploy.skip>
     </properties>
 
+    <!-- ✅ Added CodeArtifact repository -->
+    <repositories>
+        <repository>
+            <id>codeartifact</id>
+            <url>https://central-aodn-org-au-851725428481.d.codeartifact.ap-southeast-2.amazonaws.com/maven/maven-aodn-store/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
@@ -36,7 +52,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
             <exclusions>
-                <!-- Use log4j2 need to exclude logback -->
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
@@ -100,7 +115,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.geotools/gt-cql -->
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-cql</artifactId>
@@ -113,11 +127,14 @@
             <groupId>org.geotools</groupId>
             <artifactId>gt-referencing</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.geotools/gt-epsg-hsql -->
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-epsg-hsql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>au.org.aodn</groupId>
+            <artifactId>es-indexer</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.locationtech.spatial4j</groupId>
             <artifactId>spatial4j</artifactId>
@@ -131,7 +148,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
             <exclusions>
-                <!-- Use log4j2 need to exclude logback -->
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
@@ -146,7 +162,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <exclusions>
-                <!-- Use log4j2 need to exclude logback -->
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
@@ -168,15 +183,14 @@
             <artifactId>mockserver-client-java</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.skyscreamer/jsonassert -->
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
             <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -191,11 +205,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>17</source> <!-- depending on your project -->
-                    <target>17</target> <!-- depending on your project -->
+                    <source>17</source>
+                    <target>17</target>
                     <enablePreview>true</enablePreview>
                     <annotationProcessorPaths>
-                        <!-- other annotation processors -->
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>