diff --git a/openbas-api/src/main/java/io/openbas/rest/payload/form/PayloadCreateInput.java b/openbas-api/src/main/java/io/openbas/rest/payload/form/PayloadCreateInput.java
index 66509e032d..acee78a04a 100644
--- a/openbas-api/src/main/java/io/openbas/rest/payload/form/PayloadCreateInput.java
+++ b/openbas-api/src/main/java/io/openbas/rest/payload/form/PayloadCreateInput.java
@@ -1,7 +1,7 @@
 package io.openbas.rest.payload.form;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.openbas.database.model.Endpoint;
+import io.openbas.database.model.Endpoint.PLATFORM_TYPE;
 import io.openbas.database.model.PayloadArgument;
 import io.openbas.database.model.PayloadPrerequisite;
 import jakarta.validation.constraints.NotBlank;
@@ -36,7 +36,7 @@ public class PayloadCreateInput {
 
   @NotEmpty(message = MANDATORY_MESSAGE)
   @JsonProperty("payload_platforms")
-  private Endpoint.PLATFORM_TYPE[] platforms;
+  private PLATFORM_TYPE[] platforms;
 
   @JsonProperty("payload_description")
   private String description;
diff --git a/openbas-framework/src/main/java/io/openbas/config/OpenBASAgentConfig.java b/openbas-framework/src/main/java/io/openbas/config/OpenBASAgentConfig.java
index 0d4beb7efd..5221d48c08 100644
--- a/openbas-framework/src/main/java/io/openbas/config/OpenBASAgentConfig.java
+++ b/openbas-framework/src/main/java/io/openbas/config/OpenBASAgentConfig.java
@@ -6,35 +6,14 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@ConfigurationProperties(prefix = "openbas.rabbitmq")
+@ConfigurationProperties(prefix = "openbas.agent")
 @Data
-public class RabbitmqConfig {
+public class OpenBASAgentConfig {
 
-  @JsonProperty("rabbitmq_prefix")
-  private String prefix;
+    @JsonProperty("non_system_user")
+    private String nonSystemUser;
 
-  @JsonProperty("rabbitmq_hostname")
-  private String hostname;
-
-  @JsonProperty("rabbitmq_vhost")
-  private String vhost;
-
-  @JsonProperty("rabbitmq_ssl")
-  private boolean ssl;
-
-  @JsonProperty("rabbitmq_port")
-  private int port;
-
-  @JsonProperty("rabbitmq_management-port")
-  private int managementPort;
-
-  @JsonProperty("rabbitmq_user")
-  private String user;
-
-  @JsonProperty("rabbitmq_pass")
-  private String pass;
-
-  @JsonProperty("rabbitmq_queue-type")
-  private String queueType;
+    @JsonProperty("non_system_pwd")
+    private String nonSystemPwd;
 
 }