diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/AbstractJpaRepositoryManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/AbstractJpaRepositoryManagement.java
index 35c25f6eb..0fce09173 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/AbstractJpaRepositoryManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/AbstractJpaRepositoryManagement.java
@@ -367,7 +367,7 @@ abstract class AbstractJpaRepositoryManagement<T extends AbstractJpaBaseEntity,
     @SuppressWarnings("unchecked")
     private Class<A> fieldsClass0() {
         try {
-            return (Class<A>) Class.forName("org.eclipse.hawkbit.repository." + managementClass().getSimpleName() + "Fields");
+            return (Class<A>) Class.forName("org.eclipse.hawkbit.repository.qfields." + managementClass().getSimpleName() + "Fields");
         } catch (ClassNotFoundException e) {
             throw new IllegalStateException(e);
         }