diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java
index 754c6c1e1a..c93cc3a17d 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java
@@ -604,7 +604,7 @@ private void storeActionsAndStatuses(List<JpaAction> actions, Action.Status stat
     private int updateTargetAssignedDsWithFirstActiveAction(List<Long> targetIds) {
         final Query updateQuery = entityManager.createNativeQuery(
                 "UPDATE sp_target t " +
-                        "SET t.assigned_distribution_set = ( " +
+                        "SET assigned_distribution_set = ( " +
                         "SELECT a.distribution_set" +
                         "   FROM sp_action a" +
                         "   WHERE a.target = t.id AND a.active = TRUE" +
@@ -623,10 +623,10 @@ private int updateTargetAssignedDsWithFirstActiveAction(List<Long> targetIds) {
     private int updateTargetAssignedDsWithInstalledIfNoActiveActions(List<Long> targetIds) {
         final Query updateQuery = entityManager.createNativeQuery(
                 "UPDATE sp_target t " +
-                        "SET t.assigned_distribution_set = t.installed_distribution_set, t.update_status = 1 " +
+                        "SET assigned_distribution_set = t.installed_distribution_set, update_status = 1 " +
                         "WHERE t.id IN (" + Jpa.formatNativeQueryInClause("tid", targetIds) + ") " +
                         "    AND (SELECT count(*) FROM sp_action a " +
-                        "        WHERE a.target=t.id and a.active=1) = 0"
+                        "        WHERE a.target = t.id and a.active = TRUE) = 0"
         );
         Jpa.setNativeQueryInParameter(updateQuery, "tid", targetIds);
         final int updated = updateQuery.executeUpdate();