diff --git a/db-connector.go b/db-connector.go
index 88aa5ec9..8dc35dd9 100755
--- a/db-connector.go
+++ b/db-connector.go
@@ -10674,6 +10674,12 @@ func SetEnvironment(ctx context.Context, env *Environment) error {
 		env.Id = uuid.NewV4().String()
 	}
 
+	if len(env.Auth) == 0 {
+		if len(os.Getenv("SHUFFLE_ENVIRONMENT_AUTH")) > 0 {
+			env.Auth = os.Getenv("SHUFFLE_ENVIRONMENT_AUTH")
+		}
+	}
+
 	timeNow := time.Now().Unix()
 	if env.Created == 0 {
 		env.Created = timeNow