diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionDetails.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionDetails.java
index 94db3541440..dea123a3c18 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionDetails.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionDetails.java
@@ -26,12 +26,28 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai
  */
 public interface ArtemisConnectionDetails extends ConnectionDetails {
 
+	/**
+	 * Artemis deployment mode, auto-detected by default.
+	 * @return the Artemis deployment mode, auto-detected by default
+	 */
 	ArtemisMode getMode();
 
+	/**
+	 * Artemis broker url.
+	 * @return the Artemis broker url
+	 */
 	String getBrokerUrl();
 
+	/**
+	 * Login user of the broker.
+	 * @return the login user of the broker
+	 */
 	String getUser();
 
+	/**
+	 * Login password of the broker.
+	 * @return the login password of the broker
+	 */
 	String getPassword();
 
 }
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisDockerComposeConnectionDetailsFactory.java
index c2ceeb0c643..4995ef24ca4 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisDockerComposeConnectionDetailsFactory.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisDockerComposeConnectionDetailsFactory.java
@@ -27,6 +27,7 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
  * {@link ArtemisConnectionDetails} for an {@code artemis} service.
  *
  * @author Eddú Meléndez
+ * @author Moritz Halbritter
  */
 class ArtemisDockerComposeConnectionDetailsFactory
 		extends DockerComposeConnectionDetailsFactory<ArtemisConnectionDetails> {
@@ -34,7 +35,7 @@ class ArtemisDockerComposeConnectionDetailsFactory
 	private static final int ACTIVEMQ_PORT = 61616;
 
 	protected ArtemisDockerComposeConnectionDetailsFactory() {
-		super("apache/activemq-classic");
+		super("apache/activemq-artemis");
 	}
 
 	@Override
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironment.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironment.java
index 078f216c258..a44dc69aa6d 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironment.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironment.java
@@ -22,6 +22,7 @@ import java.util.Map;
  * Artemis environment details.
  *
  * @author Eddú Meléndez
+ * @author Moritz Halbritter
  */
 class ArtemisEnvironment {
 
@@ -30,8 +31,8 @@ class ArtemisEnvironment {
 	private final String password;
 
 	ArtemisEnvironment(Map<String, String> env) {
-		this.user = env.get("ACTIVEMQ_CONNECTION_USER");
-		this.password = env.get("ACTIVEMQ_CONNECTION_PASSWORD");
+		this.user = env.get("ARTEMIS_USER");
+		this.password = env.get("ARTEMIS_PASSWORD");
 	}
 
 	String getUser() {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironmentTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironmentTests.java
index d3781014b0f..76a980a249a 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironmentTests.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisEnvironmentTests.java
@@ -38,7 +38,7 @@ class ArtemisEnvironmentTests {
 
 	@Test
 	void getUserWhenHasActiveMqUser() {
-		ArtemisEnvironment environment = new ArtemisEnvironment(Map.of("ACTIVEMQ_CONNECTION_USER", "me"));
+		ArtemisEnvironment environment = new ArtemisEnvironment(Map.of("ARTEMIS_USER", "me"));
 		assertThat(environment.getUser()).isEqualTo("me");
 	}
 
@@ -50,7 +50,7 @@ class ArtemisEnvironmentTests {
 
 	@Test
 	void getPasswordWhenHasActiveMqPassword() {
-		ArtemisEnvironment environment = new ArtemisEnvironment(Map.of("ACTIVEMQ_CONNECTION_PASSWORD", "secret"));
+		ArtemisEnvironment environment = new ArtemisEnvironment(Map.of("ARTEMIS_PASSWORD", "secret"));
 		assertThat(environment.getPassword()).isEqualTo("secret");
 	}
 
diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/activemq/artemis-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/activemq/artemis-compose.yaml
index ffdd8c6b78a..c9ea82fbadd 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/activemq/artemis-compose.yaml
+++ b/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/activemq/artemis-compose.yaml
@@ -4,5 +4,5 @@ services:
     ports:
       - '61616'
     environment:
-      ACTIVEMQ_CONNECTION_USER: 'root'
-      ACTIVEMQ_CONNECTION_PASSWORD: 'secret'
+      ARTEMIS_USER: 'root'
+      ARTEMIS_PASSWORD: 'secret'
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc
index 6b8c5688e23..4fa42013c0a 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc
@@ -72,6 +72,9 @@ The following service connections are currently supported:
 | `ActiveMQConnectionDetails`
 | Containers named "symptoma/activemq"
 
+| `ArtemisConnectionDetails`
+| Containers named "apache/activemq-artemis"
+
 | `CassandraConnectionDetails`
 | Containers named "cassandra"