diff --git a/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiOpenApiConfiguration.java b/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiOpenApiConfiguration.java
index 3cb1c4407..c84fdc5ea 100644
--- a/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiOpenApiConfiguration.java
+++ b/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiOpenApiConfiguration.java
@@ -19,17 +19,14 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnProperty(
-        value = OpenApiConfiguration.HAWKBIT_SERVER_SWAGGER_ENABLED,
-        havingValue = "true",
-        matchIfMissing = true)
+@ConditionalOnProperty(value = OpenApiConfiguration.HAWKBIT_SERVER_OPENAPI_ENABLED, havingValue = "true", matchIfMissing = true)
 public class DdiOpenApiConfiguration {
 
     private static final String DDI_TOKEN_SEC_SCHEME_NAME = "Token";
 
     @Bean
     @ConditionalOnProperty(
-            value = "hawkbit.server.swagger.ddi.api.group.enabled",
+            value = "hawkbit.server.openapi.ddi.enabled",
             havingValue = "true",
             matchIfMissing = true)
     public GroupedOpenApi ddiApi() {
diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java
index 678df189f..a93637676 100644
--- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java
+++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java
@@ -19,10 +19,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnProperty(
-        value = "hawkbit.server.swagger.enabled",
-        havingValue = "true",
-        matchIfMissing = true)
+@ConditionalOnProperty(value = OpenApiConfiguration.HAWKBIT_SERVER_OPENAPI_ENABLED, havingValue = "true", matchIfMissing = true)
 public class MgmtOpenApiConfiguration {
 
     private static final String BASIC_AUTH_SEC_SCHEME_NAME = "Basic";
@@ -30,7 +27,7 @@ public class MgmtOpenApiConfiguration {
 
     @Bean
     @ConditionalOnProperty(
-            value = OpenApiConfiguration.HAWKBIT_SERVER_SWAGGER_ENABLED,
+            value = "hawkbit.server.openapi.mgmt.enabled",
             havingValue = "true",
             matchIfMissing = true)
     public GroupedOpenApi mgmtApi() {
diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application.properties b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application.properties
index 784dad041..d9bf327ac 100644
--- a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application.properties
+++ b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/application.properties
@@ -48,9 +48,6 @@ spring.rabbitmq.port=5672
 #hawkbit.server.security.cors.enabled=true
 #hawkbit.server.security.cors.allowedOrigins=http://localhost
 
-hawkbit.server.swagger.mgmt.api.group.enabled=true
-hawkbit.server.swagger.ddi.api.group.enabled=false
-
 # Swagger Configuration
 springdoc.api-docs.version=openapi_3_0
 springdoc.show-oauth2-endpoints=true
diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java b/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
index 67d9cba79..28025d065 100644
--- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
+++ b/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
@@ -22,13 +22,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnProperty(
-        value = OpenApiConfiguration.HAWKBIT_SERVER_SWAGGER_ENABLED,
-        havingValue = "true",
-        matchIfMissing = true)
+@ConditionalOnProperty(value = OpenApiConfiguration.HAWKBIT_SERVER_OPENAPI_ENABLED, havingValue = "true", matchIfMissing = true)
 public class OpenApiConfiguration {
 
-    public static final String HAWKBIT_SERVER_SWAGGER_ENABLED = "hawkbit.server.swagger.enabled";
+    public static final String HAWKBIT_SERVER_OPENAPI_ENABLED = "hawkbit.server.openapi.enabled";
 
     public static final String X_HAWKBIT = "x-hawkbit";
     public static final String ORDER = "order";