diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 761c69def0..9a159859b5 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -4181,6 +4181,13 @@ Infinispan has no default configuration file location so it must be specified ex
 Caches can be created on startup via the `spring.cache.cache-names` property. If a custom
 `ConfigurationBuilder` bean is defined, it is used to customize them.
 
+[NOTE]
+====
+The support of Infinispan in Spring Boot is restricted to the embedded mode and is quite
+basic. If you want more options you should use the official Infinispan Spring Boot starter
+instead, check
+https://github.com/infinispan/infinispan-spring-boot[the documentation] for more details.
+====
 
 
 [[boot-features-caching-provider-couchbase]]
diff --git a/spring-boot-samples/spring-boot-sample-cache/README.adoc b/spring-boot-samples/spring-boot-sample-cache/README.adoc
index 4974813e4c..5e75af6a1d 100644
--- a/spring-boot-samples/spring-boot-sample-cache/README.adoc
+++ b/spring-boot-samples/spring-boot-sample-cache/README.adoc
@@ -91,7 +91,9 @@ can set the `spring.cache.infinispan.config` property to use the provided
 TIP: Run sample cache application using Infinispan with
 `$mvn spring-boot:run -Pinfinispan`.
 
-
+NOTE: If you want to use the client/server mode or if you need more options, Infinispan
+provides an official Spring Boot starter, check
+https://github.com/infinispan/infinispan-spring-boot[the documentation] for more details.
 
 === Couchbase
 Add the `java-client` and `couchbase-spring-cache` dependencies and make sure that