diff --git a/libbeat/esleg/eslegclient/connection.go b/libbeat/esleg/eslegclient/connection.go
index 9736af191fd0..322d0f08dbf1 100644
--- a/libbeat/esleg/eslegclient/connection.go
+++ b/libbeat/esleg/eslegclient/connection.go
@@ -423,6 +423,7 @@ func (conn *Connection) getVersion() error {
 	}
 
 	if versionData.Version.BuildFlavor == "serverless" {
+		conn.log.Info("build flavor of es is severless, marking connection as serverless")
 		conn.isServerless = true
 	} else if versionData.Version.BuildFlavor == "default" {
 		conn.isServerless = false
diff --git a/libbeat/template/template.go b/libbeat/template/template.go
index cb3fe33f8f1b..ae67e7ec542e 100644
--- a/libbeat/template/template.go
+++ b/libbeat/template/template.go
@@ -22,6 +22,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/mapstr"
 	"github.com/elastic/elastic-agent-libs/version"
 	"github.com/elastic/go-ucfg/yaml"
@@ -316,6 +317,7 @@ func buildIdxSettings(ver version.V, userSettings mapstr.M, isServerless bool) m
 
 	// deal with settings that aren't available on serverless
 	if isServerless {
+		logp.L().Infof("remote instance is severless, number_of_shards and max_docvalue_fields_search will be skipped in index template")
 		userSettings.Delete("number_of_shards")
 	} else {
 		indexSettings.Put("max_docvalue_fields_search", defaultMaxDocvalueFieldsSearch)