diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java
index 67ea22f85b0..a75f72d6592 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java
@@ -46,15 +46,10 @@ public abstract class AbstractBuildLog implements BuildLog {
 	@Override
 	public Consumer<TotalProgressEvent> pullingImage(ImageReference imageReference, ImagePlatform platform,
 			ImageType imageType) {
-		String message;
-		if (platform != null) {
-			message = String.format(" > Pulling %s '%s' for platform '%s'", imageType.getDescription(), imageReference,
-					platform);
-		}
-		else {
-			message = String.format(" > Pulling %s '%s'", imageType.getDescription(), imageReference);
-		}
-		return getProgressConsumer(message);
+		return (platform != null)
+				? getProgressConsumer(" > Pulling %s '%s' for platform '%s'".formatted(imageType.getDescription(),
+						imageReference, platform))
+				: getProgressConsumer(" > Pulling %s '%s'".formatted(imageType.getDescription(), imageReference));
 	}
 
 	@Override
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
index 32a00f4775b..586735fc5c7 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
@@ -64,7 +64,9 @@ public class DockerApi {
 
 	private static final List<String> FORCE_PARAMS = Collections.unmodifiableList(Arrays.asList("force", "1"));
 
-	static final ApiVersion MINIMUM_API_VERSION = ApiVersion.parse("1.24");
+	static final ApiVersion MINIMUM_API_VERSION = ApiVersion.of(1, 24);
+
+	static final ApiVersion MINIMUM_PLATFORM_API_VERSION = ApiVersion.of(1, 41);
 
 	static final String API_VERSION_HEADER_NAME = "API-Version";
 
@@ -80,7 +82,7 @@ public class DockerApi {
 
 	private final SystemApi system;
 
-	private ApiVersion apiVersion = null;
+	private volatile ApiVersion apiVersion = null;
 
 	/**
 	 * Create a new {@link DockerApi} instance.
@@ -126,10 +128,7 @@ public class DockerApi {
 
 	private URI buildUrl(String path, Object... params) {
 		try {
-			if (this.apiVersion == null) {
-				this.apiVersion = this.system.getApiVersion();
-			}
-			URIBuilder builder = new URIBuilder("/v" + this.apiVersion + path);
+			URIBuilder builder = new URIBuilder("/v" + getApiVersion() + path);
 			int param = 0;
 			while (param < params.length) {
 				builder.addParameter(Objects.toString(params[param++]), Objects.toString(params[param++]));
@@ -141,11 +140,19 @@ public class DockerApi {
 		}
 	}
 
-	private void verifyApiVersionForPlatform() {
-		ApiVersion minimumPlatformApiVersion = ApiVersion.of(1, 41);
-		Assert.isTrue(this.apiVersion.supports(minimumPlatformApiVersion),
-				"Docker API version must be at least " + minimumPlatformApiVersion
-						+ " to support the 'imagePlatform' option, but current API version is " + this.apiVersion);
+	private void verifyApiVersionForPlatform(ImagePlatform platform) {
+		Assert.isTrue(platform == null || getApiVersion().supports(MINIMUM_PLATFORM_API_VERSION),
+				() -> "Docker API version must be at least " + MINIMUM_PLATFORM_API_VERSION
+						+ " to support the 'imagePlatform' option, but current API version is " + getApiVersion());
+	}
+
+	private ApiVersion getApiVersion() {
+		ApiVersion apiVersion = this.apiVersion;
+		if (this.apiVersion == null) {
+			apiVersion = this.system.getApiVersion();
+			this.apiVersion = apiVersion;
+		}
+		return apiVersion;
 	}
 
 	/**
@@ -206,14 +213,10 @@ public class DockerApi {
 				UpdateListener<PullImageUpdateEvent> listener, String registryAuth) throws IOException {
 			Assert.notNull(reference, "Reference must not be null");
 			Assert.notNull(listener, "Listener must not be null");
-			URI createUri;
-			if (platform != null) {
-				createUri = buildUrl("/images/create", "fromImage", reference, "platform", platform);
-				verifyApiVersionForPlatform();
-			}
-			else {
-				createUri = buildUrl("/images/create", "fromImage", reference);
-			}
+			verifyApiVersionForPlatform(platform);
+			URI createUri = (platform != null)
+					? buildUrl("/images/create", "fromImage", reference, "platform", platform)
+					: buildUrl("/images/create", "fromImage", reference);
 			DigestCaptureUpdateListener digestCapture = new DigestCaptureUpdateListener();
 			listener.onStart();
 			try {
@@ -400,14 +403,9 @@ public class DockerApi {
 		}
 
 		private ContainerReference createContainer(ContainerConfig config, ImagePlatform platform) throws IOException {
-			URI createUri;
-			if (platform != null) {
-				createUri = buildUrl("/containers/create", "platform", platform);
-				verifyApiVersionForPlatform();
-			}
-			else {
-				createUri = buildUrl("/containers/create");
-			}
+			verifyApiVersionForPlatform(platform);
+			URI createUri = (platform != null) ? buildUrl("/containers/create", "platform", platform)
+					: buildUrl("/containers/create");
 			try (Response response = http().post(createUri, "application/json", config::writeTo)) {
 				return ContainerReference
 					.of(SharedObjectMapper.get().readTree(response.getContent()).at("/Id").asText());
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImagePlatform.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImagePlatform.java
index 93d098135ce..d43570c117f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImagePlatform.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImagePlatform.java
@@ -42,20 +42,21 @@ public class ImagePlatform {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
+	public boolean equals(Object obj) {
+		if (this == obj) {
 			return true;
 		}
-		if (!(o instanceof ImagePlatform that)) {
+		if (obj == null || getClass() != obj.getClass()) {
 			return false;
 		}
-		return Objects.equals(this.os, that.os) && Objects.equals(this.architecture, that.architecture)
-				&& Objects.equals(this.variant, that.variant);
+		ImagePlatform other = (ImagePlatform) obj;
+		return Objects.equals(this.architecture, other.architecture) && Objects.equals(this.os, other.os)
+				&& Objects.equals(this.variant, other.variant);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(this.os, this.architecture, this.variant);
+		return Objects.hash(this.architecture, this.os, this.variant);
 	}
 
 	@Override