diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
index 305bbe339..a27d8df8c 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
@@ -49,6 +49,9 @@ public enum ActionFields implements QueryField {
         this.subEntityAttributes = List.of(subEntityAttributes);
     }
 
+    /**
+     * @deprecated since 0.10.0 - use {@link #ACTIVE} instead of {@link #STATUS}
+     */
     @Deprecated(since = "0.10.0", forRemoval = true) // remove together with STATUS (with active meaning)
     public static Object convertStatusValue(final String value) {
         final String trimmedValue = value.trim();
diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java
index 71e6202b8..535e1b5bf 100644
--- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java
+++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java
@@ -94,6 +94,9 @@ public class MgmtAction extends MgmtBaseEntity {
     @Schema(description = "Type of action", example = "update")
     private String type;
     @Deprecated(since = "0.10.0")
+    /**
+     * @deprecated since 0.10.0 - use {@link #active} instead of {@link #status}
+     */
     @Schema(description = "Status of action, use active", example = "finished", deprecated = true)
     private String status;
     @Schema(description = "Status of action")
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlTargetFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlTargetFieldTest.java
index fe4bdf449..906f5009e 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlTargetFieldTest.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlTargetFieldTest.java
@@ -375,26 +375,27 @@ class RsqlTargetFieldTest extends AbstractJpaIntegrationTest {
      */
     @Test
     void rsqlValidTargetFields() {
-        QLSupport.getInstance().validate(
+        final QLSupport qlSupport = QLSupport.getInstance();
+        qlSupport.validate(
                 "ID == '0123' and NAME == abcd and DESCRIPTION == absd and CREATEDAT =lt= 0123 and LASTMODIFIEDAT =gt= 0123" +
                         " and CONTROLLERID == 0123 and UPDATESTATUS == PENDING and IPADDRESS == 0123 and LASTCONTROLLERREQUESTAT == 0123" +
                         " and tag == beta",
                 TargetFields.class, JpaTarget.class);
-        QLSupport.getInstance().validate(
+        qlSupport.validate(
                 "ASSIGNEDDS.name == abcd and ASSIGNEDDS.version == 0123 and INSTALLEDDS.name == abcd and INSTALLEDDS.version == 0123",
                 TargetFields.class, JpaTarget.class);
-        QLSupport.getInstance().validate(
+        qlSupport.validate(
                 "ATTRIBUTE.subkey1 == test and ATTRIBUTE.subkey2 == test and METADATA.metakey1 == abcd and METADATA.metavalue2 == asdfg",
                 TargetFields.class, JpaTarget.class);
-        QLSupport.getInstance().validate(
+        qlSupport.validate(
                 "CREATEDAT =lt= ${NOW_TS} and LASTMODIFIEDAT =ge= ${OVERDUE_TS}",
                 TargetFields.class, JpaTarget.class);
-        QLSupport.getInstance().validate(
+        qlSupport.validate(
                 "ATTRIBUTE.test.dot == test and ATTRIBUTE.subkey2 == test and METADATA.test.dot == abcd and METADATA.metavalue2 == asdfg",
                 TargetFields.class, JpaTarget.class);
 
         assertThatExceptionOfType(RSQLParameterUnsupportedFieldException.class)
-                .isThrownBy(() -> QLSupport.getInstance().validate("wrongfield == abcd", TargetFields.class, JpaTarget.class));
+                .isThrownBy(() -> qlSupport.validate("wrongfield == abcd", TargetFields.class, JpaTarget.class));
     }
 
     /**
@@ -448,7 +449,8 @@ class RsqlTargetFieldTest extends AbstractJpaIntegrationTest {
     }
 
     private void assertRSQLQueryThrowsException(final String rsql) {
+        final QLSupport qlSupport = QLSupport.getInstance();
         assertThatExceptionOfType(RSQLParameterUnsupportedFieldException.class)
-                .isThrownBy(() -> QLSupport.getInstance().validate(rsql, TargetFields.class, JpaTarget.class));
+                .isThrownBy(() -> qlSupport.validate(rsql, TargetFields.class, JpaTarget.class));
     }
 }
\ No newline at end of file