diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultConnectionPorts.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultConnectionPorts.java
index d9823e653a1..2981385ecb6 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultConnectionPorts.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultConnectionPorts.java
@@ -19,7 +19,6 @@ package org.springframework.boot.docker.compose.core;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,9 +39,9 @@ import org.springframework.util.StringUtils;
  */
 class DefaultConnectionPorts implements ConnectionPorts {
 
-	private Map<ContainerPort, Integer> mappings = new LinkedHashMap<>();
+	private final Map<ContainerPort, Integer> mappings;
 
-	private Map<Integer, Integer> portMappings = new LinkedHashMap<>();
+	private final Map<Integer, Integer> portMappings;
 
 	DefaultConnectionPorts(DockerCliInspectResponse inspectResponse) {
 		this.mappings = !isHostNetworkMode(inspectResponse)
@@ -128,7 +127,7 @@ class DefaultConnectionPorts implements ConnectionPorts {
 	 * @param number the port number
 	 * @param protocol the protocol (e.g. tcp)
 	 */
-	static record ContainerPort(int number, String protocol) {
+	record ContainerPort(int number, String protocol) {
 
 		@Override
 		public String toString() {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultRunningService.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultRunningService.java
index 5b6acbefd8d..700ec8e76ab 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultRunningService.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultRunningService.java
@@ -43,7 +43,7 @@ class DefaultRunningService implements RunningService, OriginProvider {
 
 	private final Map<String, String> labels;
 
-	private DockerEnv env;
+	private final DockerEnv env;
 
 	DefaultRunningService(DockerHost host, DockerComposeFile composeFile, DockerCliComposePsResponse composePsResponse,
 			DockerCliInspectResponse inspectResponse) {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java
index 0255fa2776c..a47f2234b44 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java
@@ -87,8 +87,7 @@ abstract sealed class DockerCliCommand<R> {
 			return false;
 		}
 		DockerCliCommand<?> other = (DockerCliCommand<?>) obj;
-		boolean result = true;
-		result = result && this.type == other.type;
+		boolean result = this.type == other.type;
 		result = result && this.responseType == other.responseType;
 		result = result && this.listResponse == other.listResponse;
 		result = result && this.command.equals(other.command);
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerHost.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerHost.java
index f224f209959..41f4306337d 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerHost.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerHost.java
@@ -34,7 +34,7 @@ final class DockerHost {
 
 	private static final String LOCALHOST = "127.0.0.1";
 
-	private String host;
+	private final String host;
 
 	private DockerHost(String host) {
 		this.host = host;
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java
index 02ff6d7f3ac..8437ff7a780 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java
@@ -49,7 +49,7 @@ class DockerComposeLifecycleManager {
 
 	private static final Log logger = LogFactory.getLog(DockerComposeLifecycleManager.class);
 
-	private static final Object IGNORE_LABEL = "org.springframework.boot.ignore";
+	private static final String IGNORE_LABEL = "org.springframework.boot.ignore";
 
 	private final File workingDirectory;
 
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ServiceNotReadyException.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ServiceNotReadyException.java
index c360867b3ca..af7cc4f22bd 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ServiceNotReadyException.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ServiceNotReadyException.java
@@ -41,7 +41,7 @@ public class ServiceNotReadyException extends RuntimeException {
 	}
 
 	/**
-	 * Return the service that was not reeady.
+	 * Return the service that was not ready.
 	 * @return the non-ready service
 	 */
 	public RunningService getService() {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/TcpConnectServiceReadinessCheck.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/TcpConnectServiceReadinessCheck.java
index 4e6f887e91c..f54ce55cf0d 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/TcpConnectServiceReadinessCheck.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/TcpConnectServiceReadinessCheck.java
@@ -33,7 +33,7 @@ import org.springframework.boot.docker.compose.core.RunningService;
  */
 class TcpConnectServiceReadinessCheck implements ServiceReadinessCheck {
 
-	private final String DISABLE_LABEL = "org.springframework.boot.readiness-check.tcp.disable";
+	private static final String DISABLE_LABEL = "org.springframework.boot.readiness-check.tcp.disable";
 
 	private final ReadinessProperties.Tcp properties;
 
@@ -43,7 +43,7 @@ class TcpConnectServiceReadinessCheck implements ServiceReadinessCheck {
 
 	@Override
 	public void check(RunningService service) {
-		if (service.labels().containsKey(this.DISABLE_LABEL)) {
+		if (service.labels().containsKey(DISABLE_LABEL)) {
 			return;
 		}
 		for (int port : service.ports().getAll("tcp")) {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchEnvironment.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchEnvironment.java
index 08f08f9fa58..1573ea2d6dd 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchEnvironment.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchEnvironment.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  */
 class ElasticsearchEnvironment {
 
-	private String password;
+	private final String password;
 
 	ElasticsearchEnvironment(Map<String, String> env) {
 		Assert.state(!env.containsKey("ELASTIC_PASSWORD_FILE"), "ELASTIC_PASSWORD_FILE is not supported");
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilder.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilder.java
index a4baf48fe1e..3157443079e 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilder.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilder.java
@@ -41,9 +41,9 @@ public class ConnectionFactoryOptionsBuilder {
 
 	private static final String PARAMETERS_LABEL = "org.springframework.boot.r2dbc.parameters";
 
-	private String driver;
+	private final String driver;
 
-	private int sourcePort;
+	private final int sourcePort;
 
 	/**
 	 * Create a new {@link JdbcUrlBuilder} instance.