diff --git a/admin-ui/Dockerfile b/admin-ui/Dockerfile
index bc7f59c1d..4caf48430 100644
--- a/admin-ui/Dockerfile
+++ b/admin-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17
+FROM eclipse-temurin:21-alpine
 LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
 LABEL org.opencontainers.image.description="Knowledge Engine: Admin UI"
 LABEL org.opencontainers.image.licenses=Apache-2.0
diff --git a/knowledge-directory/Dockerfile b/knowledge-directory/Dockerfile
index 830ec0f49..b507e577c 100644
--- a/knowledge-directory/Dockerfile
+++ b/knowledge-directory/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17
+FROM eclipse-temurin:21-alpine
 LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
 LABEL org.opencontainers.image.description="Knowledge Engine: Knowledge Directory"
 LABEL org.opencontainers.image.licenses=Apache-2.0
diff --git a/knowledge-directory/pom.xml b/knowledge-directory/pom.xml
index fe3dc3f13..6311e90f2 100644
--- a/knowledge-directory/pom.xml
+++ b/knowledge-directory/pom.xml
@@ -1,275 +1,275 @@
-<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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>knowledge-directory</artifactId>
-	<name>Knowledge Engine - Knowledge Directory</name>
-
-	<parent>
-		<groupId>eu.knowledge.engine</groupId>
-		<artifactId>ke-parent</artifactId>
-		<version>${revision}</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<properties>
-		<!-- TODO move some of these to ke-parent -->
-		<swagger-core-version>2.2.15</swagger-core-version>
-		<beanvalidation-version>3.0.2</beanvalidation-version>
-		<jetty-version>11.0.15</jetty-version>
-		<jersey3-version>3.1.3</jersey3-version>
-		<jackson-version>2.16.1</jackson-version>
-		<junit-version>4.13.1</junit-version>
-		<logback-version>1.4.14</logback-version>
-		<servlet-api-version>5.0.0</servlet-api-version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-jaxrs2-jakarta</artifactId>
-			<scope>compile</scope>
-			<version>${swagger-core-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
-			<version>${swagger-core-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>${logback-version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-			<version>${servlet-api-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.containers</groupId>
-			<artifactId>jersey-container-servlet-core</artifactId>
-			<version>${jersey3-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey3-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-multipart</artifactId>
-			<version>${jersey3-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-joda</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-
-		<!-- Base64 encoding that works in both JVM and Android -->
-		<dependency>
-			<groupId>com.brsanthu</groupId>
-			<artifactId>migbase64</artifactId>
-			<version>2.2</version>
-		</dependency>
-
-		<!-- Bean Validation API support -->
-		<dependency>
-			<groupId>jakarta.validation</groupId>
-			<artifactId>jakarta.validation-api</artifactId>
-			<version>${beanvalidation-version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.25</version>
-		</dependency>
-		<!-- Jetty -->
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<!-- Add XML suport -->
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.1</version>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.openapitools</groupId>
-				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>7.2.0</version>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<packageName>eu.knowledge.engine.knowledgedirectory</packageName>
-							<apiPackage>
-								eu.knowledge.engine.knowledgedirectory.api</apiPackage>
-							<modelPackage>
-								eu.knowledge.engine.knowledgedirectory.model</modelPackage>
-							<inputSpec>
-								${project.basedir}/src/main/resources/openapi-kd.yaml</inputSpec>
-							<generatorName>jaxrs-jersey</generatorName>
-							<generateSupportingFiles>true</generateSupportingFiles>
-							<generateApis>true</generateApis>
-							<configOptions>
-								<implFolder>dummy</implFolder>
-								<strictSpec>true</strictSpec>
-								<useTags>true</useTags>
-								<dateLibrary>java8</dateLibrary>
-								<library>jersey3</library>
-							</configOptions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.5.0</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>
-									${project.basedir}/target/generated-sources/openapi/src/gen/java</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<!--
-			This plugin packages all dependencies in a so-called uber-jar. See also:
-			-
-			https://stackoverflow.com/questions/58562397/org-apache-jena-shared-noreaderforlangexception-reader-not-found-nt
-			- https://jena.apache.org/documentation/notes/jena-repack.html
-			-->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<shadedArtifactAttached>true</shadedArtifactAttached>
-					<shadedClassifierName>with-dependencies</shadedClassifierName>
-					<transformers>
-						<transformer
-							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-							<mainClass>
-								eu.knowledge.engine.knowledgedirectory.Main</mainClass>
-						</transformer>
-						<!-- <transformer
-						implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
-						/>
-								<transformer
-						implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"
-						/>
-								<transformer
-						implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-										<addHeader>false</addHeader>
-								</transformer> -->
-					</transformers>
-					<filters>
-						<filter>
-							<artifact>*:*</artifact>
-							<excludes>
-								<!-- Some jars are signed but shading breaks
-								that.
-														Don't include signing files.
-												-->
-								<exclude>META-INF/*.SF</exclude>
-								<exclude>META-INF/*.DSA</exclude>
-								<exclude>META-INF/*.RSA</exclude>
-							</excludes>
-						</filter>
-					</filters>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>knowledge-directory</artifactId>
+	<name>Knowledge Engine - Knowledge Directory</name>
+
+	<parent>
+		<groupId>eu.knowledge.engine</groupId>
+		<artifactId>ke-parent</artifactId>
+		<version>${revision}</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<properties>
+		<!-- TODO move some of these to ke-parent -->
+		<swagger-core-version>2.2.15</swagger-core-version>
+		<beanvalidation-version>3.0.2</beanvalidation-version>
+		<jetty-version>11.0.15</jetty-version>
+		<jersey3-version>3.1.3</jersey3-version>
+		<jackson-version>2.16.1</jackson-version>
+		<junit-version>4.13.1</junit-version>
+		<logback-version>1.4.14</logback-version>
+		<servlet-api-version>5.0.0</servlet-api-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-jaxrs2-jakarta</artifactId>
+			<scope>compile</scope>
+			<version>${swagger-core-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
+			<version>${swagger-core-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback-version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>${servlet-api-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-servlet-core</artifactId>
+			<version>${jersey3-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey3-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-multipart</artifactId>
+			<version>${jersey3-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-joda</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+
+		<!-- Base64 encoding that works in both JVM and Android -->
+		<dependency>
+			<groupId>com.brsanthu</groupId>
+			<artifactId>migbase64</artifactId>
+			<version>2.2</version>
+		</dependency>
+
+		<!-- Bean Validation API support -->
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>${beanvalidation-version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+		<!-- Jetty -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<!-- Add XML suport -->
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.1</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.openapitools</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<version>7.2.0</version>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<packageName>eu.knowledge.engine.knowledgedirectory</packageName>
+							<apiPackage>
+								eu.knowledge.engine.knowledgedirectory.api</apiPackage>
+							<modelPackage>
+								eu.knowledge.engine.knowledgedirectory.model</modelPackage>
+							<inputSpec>
+								${project.basedir}/src/main/resources/openapi-kd.yaml</inputSpec>
+							<generatorName>jaxrs-jersey</generatorName>
+							<generateSupportingFiles>true</generateSupportingFiles>
+							<generateApis>true</generateApis>
+							<configOptions>
+								<implFolder>dummy</implFolder>
+								<strictSpec>true</strictSpec>
+								<useTags>true</useTags>
+								<dateLibrary>java8</dateLibrary>
+								<library>jersey3</library>
+							</configOptions>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.5.0</version>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>
+									${project.basedir}/target/generated-sources/openapi/src/gen/java</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.2</version>
+				<executions>
+					<execution>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!--
+			This plugin packages all dependencies in a so-called uber-jar. See also:
+			-
+			https://stackoverflow.com/questions/58562397/org-apache-jena-shared-noreaderforlangexception-reader-not-found-nt
+			- https://jena.apache.org/documentation/notes/jena-repack.html
+			-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<shadedArtifactAttached>true</shadedArtifactAttached>
+					<shadedClassifierName>with-dependencies</shadedClassifierName>
+					<transformers>
+						<transformer
+							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+							<mainClass>
+								eu.knowledge.engine.knowledgedirectory.Main</mainClass>
+						</transformer>
+						<!-- <transformer
+						implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
+						/>
+								<transformer
+						implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"
+						/>
+								<transformer
+						implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+										<addHeader>false</addHeader>
+								</transformer> -->
+					</transformers>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<!-- Some jars are signed but shading breaks
+								that.
+														Don't include signing files.
+												-->
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+							</excludes>
+						</filter>
+					</filters>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/smart-connector-rest-dist/Dockerfile b/smart-connector-rest-dist/Dockerfile
index 00dd685c2..bca11501e 100644
--- a/smart-connector-rest-dist/Dockerfile
+++ b/smart-connector-rest-dist/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17
+FROM eclipse-temurin:21-alpine
 LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
 LABEL org.opencontainers.image.description="Knowledge Engine: Smart Connector (with HTTP API)"
 LABEL org.opencontainers.image.licenses=Apache-2.0
@@ -8,6 +8,13 @@ ARG JAR_FILE=target/*-with-dependencies.jar
 # Copy the jar in a single directory
 COPY ${JAR_FILE} /knowledge_engine/knowledge-engine.jar
 
+# Make sure files/folders needed by the processes are accessable when they run under the nobody user
+RUN chown -R nobody /knowledge_engine
+
+# Switch to use a non-root user from here on
+# Use uid of nobody user (65534) because kubernetes expects numeric user when applying pod security policies
+USER 65534
+
 EXPOSE 8280
 
 # Add that directory to the class path.
diff --git a/smart-connector-rest-server/pom.xml b/smart-connector-rest-server/pom.xml
index 6b8831984..09ac28c8b 100644
--- a/smart-connector-rest-server/pom.xml
+++ b/smart-connector-rest-server/pom.xml
@@ -14,7 +14,7 @@
 		<swagger-core-version>2.2.15</swagger-core-version>
 		<jetty-version>11.0.15</jetty-version>
 		<jersey3-version>3.1.3</jersey3-version>
-		<jackson-version>2.15.2</jackson-version>
+		<jackson-version>2.16.1</jackson-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
diff --git a/smart-connector/pom.xml b/smart-connector/pom.xml
index e3e74a2d8..b33743e0c 100644
--- a/smart-connector/pom.xml
+++ b/smart-connector/pom.xml
@@ -1,272 +1,272 @@
-<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">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>smart-connector</artifactId>
-	<packaging>jar</packaging>
-	<name>Knowledge Engine - Smart Connector</name>
-	<parent>
-		<groupId>eu.knowledge.engine</groupId>
-		<artifactId>ke-parent</artifactId>
-		<version>${revision}</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<dependencies>
-		<!-- Only needed as dependency for unit tests -->
-		<dependency>
-			<groupId>eu.knowledge.engine</groupId>
-			<artifactId>knowledge-directory</artifactId>
-			<version>${revision}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.25</version>
-		</dependency>
-
-		<!-- unit tests -->
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.7.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.7.0</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- jena -->
-		<dependency>
-			<groupId>org.apache.jena</groupId>
-			<artifactId>apache-jena-libs</artifactId>
-			<type>pom</type>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.annotation</groupId>
-					<artifactId>javax.annotation-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- graph algorithms -->
-		<dependency>
-			<groupId>org.jgrapht</groupId>
-			<artifactId>jgrapht-core</artifactId>
-			<version>1.5.0</version>
-		</dependency>
-		<dependency>
-			<groupId>edu.ucla.sspace</groupId>
-			<artifactId>sspace</artifactId>
-			<version>2.0.4</version>
-		</dependency>
-
-		<!-- OpenAPI stuff -->
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-jaxrs2-jakarta</artifactId>
-			<scope>compile</scope>
-			<version>${swagger-core-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
-			<version>${swagger-core-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-			<version>${servlet-api-version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-joda</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson-version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>jakarta.xml.bind</groupId>
-					<artifactId>jakarta.xml.bind-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-
-		<!--<dependency>
-			<groupId>org.glassfish.jersey.containers</groupId>
-			<artifactId>jersey-container-servlet-core</artifactId>
-			<version>${jersey3-version}</version>
-		</dependency> -->
-
-		<!-- Jetty -->
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<!-- Add XML suport -->
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.knowledge.engine</groupId>
-			<artifactId>smart-connector-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>eu.knowledge.engine</groupId>
-			<artifactId>reasoner</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<!-- Java cache -->
-		<dependency>
-			<groupId>javax.cache</groupId>
-			<artifactId>cache-api</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>3.9.9</version>
-		</dependency>
-	</dependencies>
-
-	<properties>
-		<swagger-core-version>2.2.15</swagger-core-version>
-		<jetty-version>11.0.15</jetty-version>
-		<jersey3-version>3.1.3</jersey3-version>
-		<jackson-version>2.16.1</jackson-version>
-		<servlet-api-version>5.0.0</servlet-api-version>
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.openapitools</groupId>
-				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>7.2.0</version>
-				<executions>
-					<!-- Generate InterKnowledgeEngineRuntime protocol classes -->
-					<execution>
-						<id>inter-ker</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<packageName>
-								eu.knowledge.engine.smartconnector.runtime.messaging.inter_ker</packageName>
-							<apiPackage>
-								eu.knowledge.engine.smartconnector.runtime.messaging.inter_ker.api</apiPackage>
-							<modelPackage>
-								eu.knowledge.engine.smartconnector.runtime.messaging.inter_ker.model</modelPackage>
-							<inputSpec>
-								${project.basedir}/src/main/resources/openapi-inter-ker.yaml</inputSpec>
-							<generatorName>jaxrs-jersey</generatorName>
-							<generateSupportingFiles>true</generateSupportingFiles>
-							<generateApis>true</generateApis>
-							<templateDirectory>
-								${project.basedir}/src/main/resources/openapi_template/</templateDirectory>
-							<configOptions>
-								<implFolder>dummy</implFolder>
-								<strictSpec>true</strictSpec>
-								<useTags>true</useTags>
-								<dateLibrary>java8</dateLibrary>
-								<library>jersey3</library>
-							</configOptions>
-						</configuration>
-					</execution>
-
-					<!-- Generate Knowledge Directory protocol classes -->
-					<execution>
-						<id>kd</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<modelPackage>
-								eu.knowledge.engine.smartconnector.runtime.messaging.kd.model</modelPackage>
-							<inputSpec>
-								${project.basedir}/../knowledge-directory/src/main/resources/openapi-kd.yaml</inputSpec>
-							<generatorName>jaxrs-jersey</generatorName>
-							<generateSupportingFiles>false</generateSupportingFiles>
-							<generateApis>false</generateApis>
-							<configOptions>
-								<implFolder>dummy</implFolder>
-								<strictSpec>true</strictSpec>
-								<useTags>true</useTags>
-								<dateLibrary>java8</dateLibrary>
-								<library>jersey3</library>
-							</configOptions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.5.0</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>
-									${project.basedir}/target/generated-sources/openapi/src/gen/java</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-		</plugins>
-	</build>
+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>smart-connector</artifactId>
+	<packaging>jar</packaging>
+	<name>Knowledge Engine - Smart Connector</name>
+	<parent>
+		<groupId>eu.knowledge.engine</groupId>
+		<artifactId>ke-parent</artifactId>
+		<version>${revision}</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<dependencies>
+		<!-- Only needed as dependency for unit tests -->
+		<dependency>
+			<groupId>eu.knowledge.engine</groupId>
+			<artifactId>knowledge-directory</artifactId>
+			<version>${revision}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+
+		<!-- unit tests -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.7.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.7.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- jena -->
+		<dependency>
+			<groupId>org.apache.jena</groupId>
+			<artifactId>apache-jena-libs</artifactId>
+			<type>pom</type>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- graph algorithms -->
+		<dependency>
+			<groupId>org.jgrapht</groupId>
+			<artifactId>jgrapht-core</artifactId>
+			<version>1.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>edu.ucla.sspace</groupId>
+			<artifactId>sspace</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+
+		<!-- OpenAPI stuff -->
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-jaxrs2-jakarta</artifactId>
+			<scope>compile</scope>
+			<version>${swagger-core-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
+			<version>${swagger-core-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>${servlet-api-version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-joda</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.xml.bind</groupId>
+					<artifactId>jakarta.xml.bind-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+
+		<!--<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-servlet-core</artifactId>
+			<version>${jersey3-version}</version>
+		</dependency> -->
+
+		<!-- Jetty -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<!-- Add XML suport -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>eu.knowledge.engine</groupId>
+			<artifactId>smart-connector-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.knowledge.engine</groupId>
+			<artifactId>reasoner</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- Java cache -->
+		<dependency>
+			<groupId>javax.cache</groupId>
+			<artifactId>cache-api</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ehcache</groupId>
+			<artifactId>ehcache</artifactId>
+			<version>3.9.9</version>
+		</dependency>
+	</dependencies>
+
+	<properties>
+		<swagger-core-version>2.2.15</swagger-core-version>
+		<jetty-version>11.0.15</jetty-version>
+		<jersey3-version>3.1.3</jersey3-version>
+		<jackson-version>2.16.1</jackson-version>
+		<servlet-api-version>5.0.0</servlet-api-version>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.openapitools</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<version>7.2.0</version>
+				<executions>
+					<!-- Generate InterKnowledgeEngineRuntime protocol classes -->
+					<execution>
+						<id>inter-ker</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<packageName>
+								eu.knowledge.engine.smartconnector.runtime.messaging.inter_ker</packageName>
+							<apiPackage>
+								eu.knowledge.engine.smartconnector.runtime.messaging.inter_ker.api</apiPackage>
+							<modelPackage>
+								eu.knowledge.engine.smartconnector.runtime.messaging.inter_ker.model</modelPackage>
+							<inputSpec>
+								${project.basedir}/src/main/resources/openapi-inter-ker.yaml</inputSpec>
+							<generatorName>jaxrs-jersey</generatorName>
+							<generateSupportingFiles>true</generateSupportingFiles>
+							<generateApis>true</generateApis>
+							<templateDirectory>
+								${project.basedir}/src/main/resources/openapi_template/</templateDirectory>
+							<configOptions>
+								<implFolder>dummy</implFolder>
+								<strictSpec>true</strictSpec>
+								<useTags>true</useTags>
+								<dateLibrary>java8</dateLibrary>
+								<library>jersey3</library>
+							</configOptions>
+						</configuration>
+					</execution>
+
+					<!-- Generate Knowledge Directory protocol classes -->
+					<execution>
+						<id>kd</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<modelPackage>
+								eu.knowledge.engine.smartconnector.runtime.messaging.kd.model</modelPackage>
+							<inputSpec>
+								${project.basedir}/../knowledge-directory/src/main/resources/openapi-kd.yaml</inputSpec>
+							<generatorName>jaxrs-jersey</generatorName>
+							<generateSupportingFiles>false</generateSupportingFiles>
+							<generateApis>false</generateApis>
+							<configOptions>
+								<implFolder>dummy</implFolder>
+								<strictSpec>true</strictSpec>
+								<useTags>true</useTags>
+								<dateLibrary>java8</dateLibrary>
+								<library>jersey3</library>
+							</configOptions>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.5.0</version>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>
+									${project.basedir}/target/generated-sources/openapi/src/gen/java</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+
+		</plugins>
+	</build>
 </project>
\ No newline at end of file