diff --git a/metis-authentication/metis-authentication-rest/Dockerfile b/metis-authentication/metis-authentication-rest/Dockerfile
index 6fd911e52..cc5d7e9ca 100644
--- a/metis-authentication/metis-authentication-rest/Dockerfile
+++ b/metis-authentication/metis-authentication-rest/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM openjdk:21-slim
 COPY target/*.jar app.jar
 EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file
diff --git a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java
index b7793cb89..819d5b8c8 100644
--- a/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java
+++ b/metis-authentication/metis-authentication-rest/src/main/java/eu/europeana/metis/authentication/rest/controller/AuthenticationController.java
@@ -100,10 +100,16 @@ public void registerUser(@RequestHeader("Authorization") String authorization)
   @ResponseBody
   public MetisUserView loginUser(@RequestHeader("Authorization") String authorization)
       throws GenericMetisException {
+    MetisUserView metisUserView;
     Credentials credentials = authenticationService
         .validateAuthorizationHeaderWithCredentials(authorization);
-    MetisUserView metisUserView = authenticationService
-        .loginUser(credentials.getEmail(), credentials.getPassword());
+    try {
+      metisUserView = authenticationService
+          .loginUser(credentials.getEmail(), credentials.getPassword());
+    } catch (GenericMetisException e) {
+      LOGGER.info("Authentication failed for user with email: {}", credentials.getEmail());
+      throw e;
+    }
     LOGGER.info("User with email: {} and user id: {} logged in", metisUserView.getEmail(),
         metisUserView.getUserId());
     return metisUserView;
diff --git a/pom.xml b/pom.xml
index 81655f3f7..fa19c4654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
     <version.ibm.icu4j>69.1</version.ibm.icu4j>
     <version.itextpdf>5.5.13.2</version.itextpdf>
     <version.jackson>2.13.0</version.jackson>
-    <version.elastic.apm>1.34.1</version.elastic.apm>
+    <version.elastic.apm>1.43.0</version.elastic.apm>
     <version.javax.annotation>1.3.2</version.javax.annotation>
     <version.javax.mail>1.6.0</version.javax.mail>
     <version.javax.persistence>1.0.2</version.javax.persistence>