diff --git a/cmd/buildctl/main.go b/cmd/buildctl/main.go
index 76a251cd6c45..397bb0a5db53 100644
--- a/cmd/buildctl/main.go
+++ b/cmd/buildctl/main.go
@@ -116,6 +116,9 @@ func main() {
 		debugEnabled = context.GlobalBool("debug")
 		// Use Format flag to control log formatter
 		logFormat := context.GlobalString("log-format")
+		if logFormat == "" {
+        		logFormat = os.Getenv("BUILDKITD_LOG_FORMAT")
+	        }  
 		switch logFormat {
 		case "json":
 			logrus.SetFormatter(&logrus.JSONFormatter{})
diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go
index c97a6c201833..9d6f32f8ebf7 100644
--- a/cmd/buildkitd/main.go
+++ b/cmd/buildkitd/main.go
@@ -183,6 +183,7 @@ func main() {
 			Name:  "log-format",
 			Usage: "log formatter: json or text",
 			Value: "text",
+			EnvVar: "BUILDKITD_LOG_FORMAT",
 		},
 		cli.StringFlag{
 			Name:  "group",