diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java
index a72373c06b7f..e90d901fc474 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java
@@ -257,7 +257,7 @@ private BuildRequest customize(BuildRequest request) {
 		if (StringUtils.hasText(this.runImage)) {
 			request = request.withRunImage(ImageReference.of(this.runImage));
 		}
-		if (this.env != null && !this.env.isEmpty()) {
+		if (!CollectionUtils.isEmpty(this.env)) {
 			request = request.withEnv(this.env);
 		}
 		if (this.cleanCache != null) {
@@ -295,10 +295,10 @@ private BuildRequest customize(BuildRequest request) {
 		if (StringUtils.hasText(this.applicationDirectory)) {
 			request = request.withApplicationDirectory(this.applicationDirectory);
 		}
-		if (this.securityOptions != null) {
+		if (!CollectionUtils.isEmpty(this.securityOptions)) {
 			request = request.withSecurityOptions(this.securityOptions);
 		}
-		if (this.imagePlatform != null) {
+		if (StringUtils.hasText(this.imagePlatform)) {
 			request = request.withImagePlatform(this.imagePlatform);
 		}
 		return request;