diff --git a/src/lib/config-generator/yaml-generator.ts b/src/lib/config-generator/yaml-generator.ts
index dda840bd..ca4e3fe6 100644
--- a/src/lib/config-generator/yaml-generator.ts
+++ b/src/lib/config-generator/yaml-generator.ts
@@ -79,7 +79,7 @@ export function generateVectorYaml(
   // Inject a per-sink metadata enrichment transform to preserve topology
   if (enrichment) {
     const sinkKeys = Object.keys(config.sinks ?? {});
-    const vrl = `.vectorflow.environment = ${JSON.stringify(enrichment.environmentName)}\n.vectorflow.pipeline_version = ${enrichment.pipelineVersion}`;
+    const vrl = `.vectorflow.environment = ${JSON.stringify(enrichment.environmentName.toLowerCase())}\n.vectorflow.pipeline_version = ${enrichment.pipelineVersion}`;
 
     for (const sinkKey of sinkKeys) {
       const sink = config.sinks[sinkKey] as Record<string, unknown>;
diff --git a/src/server/routers/pipeline.ts b/src/server/routers/pipeline.ts
index 83ee5a60..fce67850 100644
--- a/src/server/routers/pipeline.ts
+++ b/src/server/routers/pipeline.ts
@@ -204,7 +204,7 @@ export const pipelineRouter = router({
         include: {
           nodes: true,
           edges: true,
-          environment: { select: { teamId: true, gitOpsMode: true } },
+          environment: { select: { teamId: true, gitOpsMode: true, name: true } },
           nodeStatuses: {
             select: { status: true },
           },
@@ -231,7 +231,7 @@ export const pipelineRouter = router({
         const latestVersion = await prisma.pipelineVersion.findFirst({
           where: { pipelineId: input.id },
           orderBy: { version: "desc" },
-          select: { configYaml: true, logLevel: true },
+          select: { configYaml: true, logLevel: true, version: true },
         });
 
         if (latestVersion) {
@@ -252,10 +252,17 @@ export const pipelineRouter = router({
             target: e.targetNodeId,
             ...(e.sourcePort ? { sourceHandle: e.sourcePort } : {}),
           }));
+          const enrichment = pipeline.enrichMetadata
+            ? {
+                environmentName: pipeline.environment.name,
+                pipelineVersion: latestVersion.version,
+              }
+            : null;
           const currentYaml = generateVectorYaml(
             flowNodes as Parameters<typeof generateVectorYaml>[0],
             flowEdges as Parameters<typeof generateVectorYaml>[1],
             pipeline.globalConfig as Record<string, unknown> | null,
+            enrichment,
           );
           hasConfigChanges = currentYaml !== latestVersion.configYaml;