diff --git a/hawkbit-ddi/hawkbit-ddi-resource/src/test/resources/ddi-test.properties b/hawkbit-ddi/hawkbit-ddi-resource/src/test/resources/ddi-test.properties
index 4cb223a73..eaa93d23e 100644
--- a/hawkbit-ddi/hawkbit-ddi-resource/src/test/resources/ddi-test.properties
+++ b/hawkbit-ddi/hawkbit-ddi-resource/src/test/resources/ddi-test.properties
@@ -25,4 +25,4 @@ spring.servlet.multipart.max-file-size=5MB
 hawkbit.server.security.dos.maxStatusEntriesPerAction=100
 hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10
 # Quota - END
-hawkbit.events.remote-enabled=false
+hawkbit.events.remote.enabled=false
diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java
index f378ef09e..62d42373a 100644
--- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java
+++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java
@@ -74,7 +74,7 @@ import org.springframework.test.context.TestPropertySource;
 @ActiveProfiles({ "test" })
 @SpringBootTest(classes = { JpaRepositoryConfiguration.class }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @TestPropertySource(properties = {
-        "hawkbit.events.remote-enabled=false",
+        "hawkbit.events.remote.enabled=false",
         "spring.main.allow-bean-definition-overriding=true" })
 class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {
 
diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java
index 6e40ff854..f8e1621d5 100644
--- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java
+++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.TestPropertySource;
 // Dirty context is necessary to create a new vhost and recreate all necessary beans after every test class.
 @DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 @TestPropertySource(properties = {
-        "hawkbit.events.remote-enabled=false",
+        "hawkbit.events.remote.enabled=false",
         "spring.main.allow-bean-definition-overriding=true" })
 @SuppressWarnings("java:S6813") // constructor injects are not possible for test classes
 public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTest {
diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties
index c077991c3..220c6899a 100644
--- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties
+++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties
@@ -11,4 +11,4 @@
 # Logging START - activate to see request/response details
 #logging.level.org.eclipse.hawkbit.rest.util.MockMvcResultPrinter=DEBUG
 # Logging END
-hawkbit.events.remote-enabled=false
+hawkbit.events.remote.enabled=false
diff --git a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties
index bdef2cee9..dac11c1e6 100644
--- a/hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties
+++ b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties
@@ -49,8 +49,8 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.amqp.RabbitA
 
 ## Uncomment bellow to Enable communication between services (disabled by default) - no cluster support.
 # To enable it, enable RabbitMQ (see above)
-# and set below 'hawkbit.events.remote-enabled=true'
-hawkbit.events.remote-enabled=false
+# and set below 'hawkbit.events.remote.enabled=true'
+hawkbit.events.remote.enabled=false
 
 ## Disable DMF (by default) - no DMF support. To enable it, enable RabbitMQ (see above) and comment the line
 ## (hawkbit.dmf.rabbitmq.enabled=false) set hawkbit.dmf.rabbitmq.enabled=true
diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/event/EventPublisherHolder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/event/EventPublisherHolder.java
index 51e10a375..792f946a2 100644
--- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/event/EventPublisherHolder.java
+++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/event/EventPublisherHolder.java
@@ -44,7 +44,7 @@ import org.springframework.context.ApplicationEventPublisher;
 @Slf4j
 public final class EventPublisherHolder {
 
-    @Value("${hawkbit.events.remote-enabled:true}")
+    @Value("${hawkbit.events.remote.enabled:true}")
     private boolean remoteEventsEnabled;
     @Value("${hawkbit.events.remote.destination:fanoutEventChannel}")
     private String fanoutEventChannel;
@@ -65,7 +65,7 @@ public final class EventPublisherHolder {
     @PostConstruct
     private void validateRemoteEventConfig() {
         if (remoteEventsEnabled && streamBridge == null) {
-            throw new IllegalStateException("'hawkbit.events.remote-enabled' is true but streamBridge is not configured. Check if 'spring-cloud-starter-stream-rabbit' dependency is included.");
+            throw new IllegalStateException("'hawkbit.events.remote.enabled' is true but streamBridge is not configured. Check if 'spring-cloud-starter-stream-rabbit' dependency is included.");
         }
     }
 
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties b/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties
index bd159922d..95058dba2 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties
@@ -64,4 +64,4 @@ hawkbit.repository.cluster.lock.refreshOnRemainPercent=10
 ## reduce scheduler tic period to speed up tests
 hawkbit.repository.cluster.lock.ticPeriodMS=10
 
-hawkbit.events.remote-enabled=false
\ No newline at end of file
+hawkbit.events.remote.enabled=false
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/resources/hawkbit-test-defaults.properties b/hawkbit-repository/hawkbit-repository-test/src/main/resources/hawkbit-test-defaults.properties
index c21253805..2d2f3e100 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/resources/hawkbit-test-defaults.properties
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/resources/hawkbit-test-defaults.properties
@@ -80,4 +80,4 @@ hawkbit.server.security.dos.maxActionsPerTarget=20
 # Quota - END
 
 # Properties that are managed by autoconfigure module at runtime and not available during test - END
-hawkbit.events.remote-enabled=false
\ No newline at end of file
+hawkbit.events.remote.enabled=false
\ No newline at end of file