diff --git a/internal/builder/builder.go b/internal/builder/builder.go
index 5f073e6f..ba515e19 100644
--- a/internal/builder/builder.go
+++ b/internal/builder/builder.go
@@ -99,7 +99,9 @@ func (b *Builder) Instances(ctx context.Context) ([]*build.Instance, error) {
 	}
 
 	// Refer to https://github.com/cue-lang/cue/blob/v0.7.0/cmd/cue/cmd/common.go#L429
-	cfg.Tags = append(cfg.Tags, "cluster="+b.Cluster())
+	if b.Cluster() != "" {
+		cfg.Tags = append(cfg.Tags, "cluster="+b.Cluster())
+	}
 	log.DebugContext(ctx, fmt.Sprintf("cue: tags %v", cfg.Tags))
 
 	return load.Instances(args, &cfg), nil
diff --git a/internal/cli/render/render.go b/internal/cli/render/render.go
index 33f0c9a1..7afee690 100644
--- a/internal/cli/render/render.go
+++ b/internal/cli/render/render.go
@@ -28,11 +28,7 @@ func New(cfg *holos.Config) *cobra.Command {
 	cmd.Flags().AddGoFlagSet(flagSet)
 
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {
-		if cfg.ClusterName() == "" {
-			return errors.Wrap(fmt.Errorf("missing cluster name"))
-		}
-
-		ctx := cmd.Context()
+		ctx := cmd.Root().Context()
 		log := logger.FromContext(ctx).With("cluster", cfg.ClusterName())
 		build := builder.New(builder.Entrypoints(args), builder.Cluster(cfg.ClusterName()))