diff --git a/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaConfiguration.java
index d2d2de3049..b5bd73ecd6 100644
--- a/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaConfiguration.java
+++ b/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaConfiguration.java
@@ -34,14 +34,14 @@
 @Configuration
 public class JpaConfiguration extends JpaBaseConfiguration {
 
-    private final TenantAware tenantAware;
+    private final TenantAware.TenantResolver tenantResolver;
 
     protected JpaConfiguration(
             final DataSource dataSource, final JpaProperties properties,
             final ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider,
-            final TenantAware tenantAware) {
+            final TenantAware.TenantResolver tenantResolver) {
         super(dataSource, properties, jtaTransactionManagerProvider);
-        this.tenantAware = tenantAware;
+        this.tenantResolver = tenantResolver;
     }
 
     /**
@@ -53,7 +53,7 @@ protected JpaConfiguration(
     @Override
     @Bean
     public PlatformTransactionManager transactionManager(final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
-        return new MultiTenantJpaTransactionManager(tenantAware);
+        return new MultiTenantJpaTransactionManager(tenantResolver);
     }
 
     @Override
diff --git a/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/MultiTenantJpaTransactionManager.java b/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/MultiTenantJpaTransactionManager.java
index 5215dc4054..c78bc86f76 100644
--- a/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/MultiTenantJpaTransactionManager.java
+++ b/hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/MultiTenantJpaTransactionManager.java
@@ -38,7 +38,7 @@ class MultiTenantJpaTransactionManager extends JpaTransactionManager {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    private transient TenantAware tenantAware;
+    private transient TenantAware.TenantResolver tenantResolver;
 
     private static final Class<?> JPA_TARGET;
 
@@ -52,8 +52,8 @@ class MultiTenantJpaTransactionManager extends JpaTransactionManager {
         }
     }
 
-    MultiTenantJpaTransactionManager(final TenantAware tenantAware) {
-        this.tenantAware = tenantAware;
+    MultiTenantJpaTransactionManager(final TenantAware.TenantResolver tenantResolver) {
+        this.tenantResolver = tenantResolver;
     }
 
     private static final EntityPropertyChangeListener ENTITY_PROPERTY_CHANGE_LISTENER = new EntityPropertyChangeListener();
@@ -78,7 +78,7 @@ protected void doBegin(final Object transaction, final TransactionDefinition def
             }
         }
 
-        final String currentTenant = tenantAware.getCurrentTenant();
+        final String currentTenant = tenantResolver.resolveTenant();
         if (currentTenant == null) {
             cleanupTenant(em);
         } else {