diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/context/AccessContext.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/context/AccessContext.java
index abe7d8479..ff7faa0db 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/context/AccessContext.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/context/AccessContext.java
@@ -67,8 +67,8 @@ public class AccessContext {
         final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null) {
             final Object principal = authentication.getPrincipal();
-            if (principal instanceof Principal tenantAwareUser) {
-                return tenantAwareUser.getTenant();
+            if (principal instanceof Principal hawkbitPrincipal) {
+                return hawkbitPrincipal.getTenant();
             }
         }
         return null;
diff --git a/pom.xml b/pom.xml
index cc6acb6d5..8a4a0c3e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.5</version>
+        <version>4.0.6</version>
     </parent>
 
     <groupId>org.eclipse.hawkbit</groupId>
@@ -56,7 +56,7 @@
         <java.client.version>17</java.client.version>
 
         <!-- must be the same as the parent version -->
-        <spring-boot.version>4.0.5</spring-boot.version>
+        <spring-boot.version>4.0.6</spring-boot.version>
         <spring-cloud.version>2025.1.1</spring-cloud.version>
         <spring-ai.version>1.1.4</spring-ai.version>
         <springdoc-openapi.version>3.0.3</springdoc-openapi.version>