diff --git a/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml b/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml
index 5673f4e724e..261862e7e7f 100644
--- a/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml
+++ b/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml
@@ -110,6 +110,7 @@ inputs:
     name: epm/nginx
     version: 1.7.0
     dataset.namespace: prod
+    # constraints are still Experimental and should not be used in production.
     constraints?:
       # Contraints look are not final
       - os.platform: { in: "windows" }
@@ -129,6 +130,7 @@ inputs:
     name: epm/nginx
     version: 1.7.0
     dataset.namespace: prod
+    # constraints are still Experimental and should not be used in production.
     constraints?:
       # Contraints look are not final
       - os.platform: { in: "windows" }
diff --git a/x-pack/elastic-agent/pkg/agent/application/filters/constraints_filter.go b/x-pack/elastic-agent/pkg/agent/application/filters/constraints_filter.go
index c891cefb056..d9abd6c7aa3 100644
--- a/x-pack/elastic-agent/pkg/agent/application/filters/constraints_filter.go
+++ b/x-pack/elastic-agent/pkg/agent/application/filters/constraints_filter.go
@@ -28,6 +28,7 @@ var (
 )
 
 // ConstraintFilter filters ast based on included constraints.
+// constraints are still Experimental and should not be used in production.
 func ConstraintFilter(log *logger.Logger, ast *transpiler.AST) error {
 	// get datasources
 	inputsNode, found := transpiler.Lookup(ast, inputsKey)
diff --git a/x-pack/elastic-agent/pkg/agent/warn/warn.go b/x-pack/elastic-agent/pkg/agent/warn/warn.go
index c3b97079aa1..03d746992f6 100644
--- a/x-pack/elastic-agent/pkg/agent/warn/warn.go
+++ b/x-pack/elastic-agent/pkg/agent/warn/warn.go
@@ -11,7 +11,7 @@ import (
 	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/core/logger"
 )
 
-const message = "The Elastic Agent is currently in Experimental and should not be used in production"
+const message = "The Elastic Agent is currently in BETA and should not be used in production"
 
 // LogNotGA warns the users in the log that the Elastic Agent is not GA.
 func LogNotGA(log *logger.Logger) {