diff --git a/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java b/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java
index 9010fddf3..92932c826 100644
--- a/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java
+++ b/basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java
@@ -143,7 +143,7 @@ public Optional<Criteria> createFilterCriteria(DescriptorFilter filter) {
 			if (criteria == null) {
 				criteria = Criteria.where(ASSET_TYPE).is(assetType);
 			} else {
-				criteria.and(ASSET_TYPE).is(assetType);
+				criteria = criteria.and(ASSET_TYPE).is(assetType);
 			}
 		}
 		return Optional.of(criteria);
diff --git a/basyx.common/basyx.authorization/src/main/java/org/eclipse/digitaltwin/basyx/authorization/DisableSpringSecurityIfNoAuthorizationConfig.java b/basyx.common/basyx.authorization/src/main/java/org/eclipse/digitaltwin/basyx/authorization/DisableSpringSecurityIfNoAuthorizationConfig.java
index 0bad4f373..5e920e76d 100644
--- a/basyx.common/basyx.authorization/src/main/java/org/eclipse/digitaltwin/basyx/authorization/DisableSpringSecurityIfNoAuthorizationConfig.java
+++ b/basyx.common/basyx.authorization/src/main/java/org/eclipse/digitaltwin/basyx/authorization/DisableSpringSecurityIfNoAuthorizationConfig.java
@@ -31,7 +31,7 @@
 import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration;
 import org.springframework.boot.security.autoconfigure.actuate.web.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.security.autoconfigure.web.servlet.ServletWebSecurityAutoConfiguration;
-import org.springframework.boot.security.oauth2.server.resource.autoconfigure.servlet.OAuth2ResourceServerAutoConfiguration;
+import org.springframework.boot.security.oauth2.server.resource.autoconfigure.OAuth2ResourceServerAutoConfiguration;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/basyx.submodelservice/basyx.submodelservice.component/src/main/resources/application.yml b/basyx.submodelservice/basyx.submodelservice.component/src/main/resources/application.yml
index 58c6571bd..4003a4772 100644
--- a/basyx.submodelservice/basyx.submodelservice.component/src/main/resources/application.yml
+++ b/basyx.submodelservice/basyx.submodelservice.component/src/main/resources/application.yml
@@ -11,7 +11,6 @@ basyx:
           # enabled by default
           enabled: true
           defaultMapping: org.eclipse.digitaltwin.basyx.submodelservice.feature.operationdispatching.java.DefaultInvokableOperation
-          mappings: {}
           java:
             sources:
             classes: classes
diff --git a/pom.xml b/pom.xml
index b4774a0b1..7b71c875c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.7</version>
+		<version>4.1.0</version>
 		<relativePath />
 	</parent>
 	<groupId>org.eclipse.digitaltwin.basyx</groupId>