diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ed6807f..7a29d97 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v3
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
diff --git a/README.md b/README.md
index 3eb1f42..8feb7fe 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ update the *.gitignore* file appropriately.
 
 ## Build Setup
 
-The project is using the latest OpenJDK 21 to build, although earlier versions
+The project is using the latest OpenJDK 25 to build, although earlier versions
 should also work.
 
 To build the project you will need Maven, which usually comes along-side the
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9350d7f..d6465c0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,8 +14,8 @@
 # the conf-folder and point to them in application.properties.
 #
 
-# Use the official OpenJDK 21 image as the base image
-FROM eclipse-temurin:21-jre-alpine
+# Use the official OpenJDK 25 image as the base image
+FROM eclipse-temurin:25-jre-alpine
 
 LABEL org.opencontainers.image.source="https://github.com/gla-rad/eNav-MessageBroker"
 
@@ -23,7 +23,7 @@ LABEL org.opencontainers.image.source="https://github.com/gla-rad/eNav-MessageBr
 WORKDIR /app
 
 # Copy the Spring Boot JAR file into the container
-COPY target/message-broker-0.0.4-SNAPSHOT.jar .
+COPY target/message-broker-0.0.5-SNAPSHOT.jar .
 
 # Create a modules path just in case
 ENV LOADER_PATH /modules
@@ -37,4 +37,4 @@ ENV CONFIG_DIR=/conf
 
 EXPOSE 8763
 
-CMD ["java", "-jar", "message-broker-0.0.4-SNAPSHOT.jar", "--spring.config.location=optional:classpath:/,optional:file:${CONFIG_DIR}/"]
+CMD ["java", "-jar", "message-broker-0.0.5-SNAPSHOT.jar", "--spring.config.location=optional:classpath:/,optional:file:${CONFIG_DIR}/"]
diff --git a/pom.xml b/pom.xml
index 2281803..26a7b57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,119 +6,172 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.6</version>
+		<version>4.0.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>org.thls</groupId>
+	<groupId>org.grad</groupId>
 	<artifactId>message-broker</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>MessageBroker</name>
 	<description>GRAD e-Navigation Message Broker Microservice </description>
+	<licenses>
+		<license>
+			<name>Apache-2.0</name>
+			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>Free license to use with acknowledgement to GRAD.</comments>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>nvasta</id>
+			<name>Nikolaos Vastardis</name>
+			<email>Nikolaos.Vastardis@gla-rad.org</email>
+			<url>https://www.gla-rad.org/sectors/digital-services</url>
+			<organization>GRAD</organization>
+			<organizationUrl>https://www.gla-rad.org/</organizationUrl>
+		</developer>
+		<developer>
+			<id>l0rro</id>
+			<name>Lawrence Hughes</name>
+			<email>Lawrence.Hughes@gla-rad.org</email>
+			<url>https://www.gla-rad.org/sectors/digital-services</url>
+			<organization>GRAD</organization>
+			<organizationUrl>https://www.gla-rad.org/</organizationUrl>
+		</developer>
+	</developers>
 
 	<properties>
-		<java.version>21</java.version>
-		<spring-cloud.version>2025.0.0</spring-cloud.version>
-		<springdoc.version>2.8.8</springdoc.version>
-		<bootstrap.version>5.3.3</bootstrap.version>
+		<java.version>25</java.version>
+		<spring-cloud.version>2025.1.1</spring-cloud.version>
+		<springdoc.version>3.0.2</springdoc.version>
+		<bootstrap.version>5.3.8</bootstrap.version>
 		<jquery.version>3.7.1</jquery.version>
-		<fa.version>6.5.2</fa.version>
+		<fa.version>7.2.0</fa.version>
 		<geomesa.version>5.4.0</geomesa.version>
 		<scala.abi.version>2.13</scala.abi.version>
-		<kafka.version>3.9.0</kafka.version>
+		<kafka.version>3.9.2</kafka.version>
 	</properties>
 
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.0.0-M2</version>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>
+						-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
+						-Xshare:off
+					</argLine>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<executable>true</executable>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>properties</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
-                <configuration>
-                    <argLine>-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar</argLine>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<annotationProcessorPaths>
+								<path>
+									<groupId>org.projectlombok</groupId>
+									<artifactId>lombok</artifactId>
+								</path>
+							</annotationProcessorPaths>
+						</configuration>
+					</execution>
+					<execution>
+						<id>default-testCompile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<configuration>
+							<annotationProcessorPaths>
+								<path>
+									<groupId>org.projectlombok</groupId>
+									<artifactId>lombok</artifactId>
+								</path>
+							</annotationProcessorPaths>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<artifactId>spring-boot-starter-security-oauth2-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
+			<artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-oauth2-client</artifactId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-stomp</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.thymeleaf.extras</groupId>
-			<artifactId>thymeleaf-extras-springsecurity6</artifactId>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-webflux</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-core</artifactId>
+			<artifactId>spring-integration-websocket</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-websocket</artifactId>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-springsecurity6</artifactId>
 		</dependency>
 
+		<!-- Swagger -->
 		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>${springdoc.version}</version>
 		</dependency>
 
 		<!-- GeoMesa Libraries -->
@@ -155,13 +208,6 @@
 			<version>${kafka.version}</version>
 		</dependency>
 
-		<!-- Swagger -->
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>${springdoc.version}</version>
-		</dependency>
-
 		<!-- The Webjars -->
 		<dependency>
 			<groupId>org.webjars</groupId>
@@ -193,36 +239,52 @@
 			<version>${fa.version}</version>
 		</dependency>
 
+		<!-- Testing -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-test</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-properties-migrator</artifactId>
-			<scope>compile</scope>
+			<artifactId>spring-boot-starter-validation-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-test</artifactId>
+			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 	<dependencyManagement>
 		<dependencies>
-
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-devtools</artifactId>
-				<scope>runtime</scope>
-				<optional>true</optional>
-			</dependency>
-
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
@@ -230,7 +292,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/src/main/java/org/grad/eNav/msgBroker/config/SpringSecurityConfig.java b/src/main/java/org/grad/eNav/msgBroker/config/SpringSecurityConfig.java
index 4cc1a97..3db0e81 100644
--- a/src/main/java/org/grad/eNav/msgBroker/config/SpringSecurityConfig.java
+++ b/src/main/java/org/grad/eNav/msgBroker/config/SpringSecurityConfig.java
@@ -24,10 +24,10 @@
 import org.grad.eNav.msgBroker.config.mpc.MCPTokenAuthenticationManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
-import org.springframework.boot.actuate.health.HealthEndpoint;
 import org.springframework.boot.actuate.info.InfoEndpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.health.actuate.endpoint.HealthEndpoint;
+import org.springframework.boot.security.autoconfigure.actuate.web.servlet.EndpointRequest;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/grad/eNav/msgBroker/utils/GeometryJSONConverter.java b/src/main/java/org/grad/eNav/msgBroker/utils/GeometryJSONConverter.java
index 8d00bbc..f3cce09 100644
--- a/src/main/java/org/grad/eNav/msgBroker/utils/GeometryJSONConverter.java
+++ b/src/main/java/org/grad/eNav/msgBroker/utils/GeometryJSONConverter.java
@@ -59,7 +59,7 @@ public static JsonNode convertFromGeometry(Geometry geometry) {
      * @return the geometry
      */
     public static Geometry convertToGeometry(JsonNode jsonNode) {
-        if (jsonNode == null  || jsonNode.toString() == "null" || jsonNode.asText() == "null") {
+        if (jsonNode == null  || jsonNode.toString() == "null") {
             return null;
         }
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 189444e..9561814 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 server.port=8763
 spring.application.name=msg-broker
-spring.application.version=0.0.4
+spring.application.version=0.0.5
 
 # The Spring Cloud Discovery Config
 spring.config.import=optional:configserver:${ENAV_CLOUD_CONFIG_URI}
diff --git a/src/main/resources/messageBroker.conf b/src/main/resources/messageBroker.conf
index 5ac3f88..8700ab7 100644
--- a/src/main/resources/messageBroker.conf
+++ b/src/main/resources/messageBroker.conf
@@ -1,2 +1,2 @@
-JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
+JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64/
 JAVA_OPTS=-Xmx1024M
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/general.html b/src/main/resources/templates/fragments/general.html
index b1ece72..a3cd065 100644
--- a/src/main/resources/templates/fragments/general.html
+++ b/src/main/resources/templates/fragments/general.html
@@ -22,7 +22,7 @@
         <title>e-Navigation Message Broker</title>
         <link rel="icon" type="image/png" th:href="@{/images/favicon.ico}" />
         <link rel="stylesheet" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" >
-        <link rel="stylesheet" th:href="@{/webjars/font-awesome/6.5.2/css/all.min.css}"/>
+        <link rel="stylesheet" th:href="@{/webjars/font-awesome/7.2.0/css/all.min.css}"/>
         <link rel="stylesheet" th:href="@{/css/common.css}"/>
         <style th:inline="text">
             .sky-bg {
diff --git a/src/test/java/org/grad/eNav/msgBroker/MessageBrokerTest.java b/src/test/java/org/grad/eNav/msgBroker/MessageBrokerTest.java
index 51e9ee1..5c1d19e 100644
--- a/src/test/java/org/grad/eNav/msgBroker/MessageBrokerTest.java
+++ b/src/test/java/org/grad/eNav/msgBroker/MessageBrokerTest.java
@@ -21,7 +21,7 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource("classpath:application.properties")
 @Import(TestingConfiguration.class)
 class MessageBrokerTest {
diff --git a/src/test/java/org/grad/eNav/msgBroker/TestingConfiguration.java b/src/test/java/org/grad/eNav/msgBroker/TestingConfiguration.java
index 8acb3eb..5a4539f 100755
--- a/src/test/java/org/grad/eNav/msgBroker/TestingConfiguration.java
+++ b/src/test/java/org/grad/eNav/msgBroker/TestingConfiguration.java
@@ -34,18 +34,7 @@
 public class TestingConfiguration {
 
 	/**
-	 * Feign depends on the Eureka Registration Listener bean so let's mock one
-	 * up.
-	 *
-	 * @return the Eureka Registration Listener bean
-	 */
-	@Bean
-	RegistrationListener registrationListener() {
-		return mock(RegistrationListener.class);
-	}
-
-	/**
-	 * MOck a Geomesa Data Store bean so that we pretend we have a connection
+	 * Mock a Geomesa Data Store bean so that we pretend we have a connection
 	 * while the actual GS Data Store configuration is not enabled.
 	 *
 	 * @return the Geomesa Data Store bean
diff --git a/src/test/java/org/grad/eNav/msgBroker/controllers/HTMLViewerControllerTest.java b/src/test/java/org/grad/eNav/msgBroker/controllers/HTMLViewerControllerTest.java
index 9688734..0bf1e5b 100644
--- a/src/test/java/org/grad/eNav/msgBroker/controllers/HTMLViewerControllerTest.java
+++ b/src/test/java/org/grad/eNav/msgBroker/controllers/HTMLViewerControllerTest.java
@@ -19,8 +19,8 @@
 import org.grad.eNav.msgBroker.TestingConfiguration;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/src/test/java/org/grad/eNav/msgBroker/controllers/S100PublishControllerTest.java b/src/test/java/org/grad/eNav/msgBroker/controllers/S100PublishControllerTest.java
index b948038..a915f05 100644
--- a/src/test/java/org/grad/eNav/msgBroker/controllers/S100PublishControllerTest.java
+++ b/src/test/java/org/grad/eNav/msgBroker/controllers/S100PublishControllerTest.java
@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.integration.channel.PublishSubscribeChannel;
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index d11a697..d8f3736 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -4,7 +4,6 @@ spring.application.name=msg-broker
 spring.cloud.config.enabled=false
 
 # Disable Security while testing
-app.security.basic.enabled = false
 keycloak.enabled=false
 
 # Disable Eureka when testing