From 9138a179a65f7a897bf8075d8a74c039422acf46 Mon Sep 17 00:00:00 2001
From: Dmitrii Fedorov <dmitrii.fedorov@sentry.io>
Date: Tue, 16 Dec 2025 16:08:57 -0800
Subject: [PATCH 1/3] ref(s4s2): Make s4s2 region prod in pipelines

---
 libs/getsentry.libsonnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/getsentry.libsonnet b/libs/getsentry.libsonnet
index 0820725..89e6fbb 100644
--- a/libs/getsentry.libsonnet
+++ b/libs/getsentry.libsonnet
@@ -5,6 +5,7 @@
 {
   // These regions are user facing deployments
   prod_regions: [
+    's4s2',
     's4s',
     'de',
     'us',
@@ -19,7 +20,6 @@
   ],
   // Test regions will deploy in parallel to the regions above
   test_regions: [
-    's4s2',
   ],
   is_st(region):: (region == 's4s' || std.startsWith(region, 'customer-')),
 }

From c0d132f9be96ab600b7ab7d42db08faf9ebdbdfc Mon Sep 17 00:00:00 2001
From: Dmitrii Fedorov <dmitrii.fedorov@sentry.io>
Date: Tue, 16 Dec 2025 19:22:21 -0800
Subject: [PATCH 2/3] +fix tests

---
 test/pipedream.js                             | 264 +++++++++++++++---
 .../regions.jsonnet_output-files.golden       |   4 +-
 ...eploy-parallel.jsonnet_output-files.golden |  20 +-
 ...deploy-parallel.jsonnet_single-file.golden |  20 +-
 ...odeploy-serial.jsonnet_output-files.golden |  24 +-
 ...todeploy-serial.jsonnet_single-file.golden |  24 +-
 ...eploy-parallel.jsonnet_output-files.golden |  16 +-
 ...deploy-parallel.jsonnet_single-file.golden |  16 +-
 ...odeploy-serial.jsonnet_output-files.golden |  20 +-
 ...todeploy-serial.jsonnet_single-file.golden |  20 +-
 ...eploy-parallel.jsonnet_output-files.golden |  16 +-
 ...deploy-parallel.jsonnet_single-file.golden |  16 +-
 ...odeploy-serial.jsonnet_output-files.golden |  20 +-
 ...todeploy-serial.jsonnet_single-file.golden |  20 +-
 ...eploy-parallel.jsonnet_output-files.golden |  18 +-
 ...deploy-parallel.jsonnet_single-file.golden |  18 +-
 ...odeploy-serial.jsonnet_output-files.golden |  22 +-
 ...todeploy-serial.jsonnet_single-file.golden |  22 +-
 ...eploy-parallel.jsonnet_output-files.golden |  18 +-
 ...deploy-parallel.jsonnet_single-file.golden |  18 +-
 ...odeploy-serial.jsonnet_output-files.golden |  22 +-
 ...todeploy-serial.jsonnet_single-file.golden |  22 +-
 ...gions-parallel.jsonnet_output-files.golden |  18 +-
 ...egions-parallel.jsonnet_single-file.golden |  18 +-
 ...minimal-config.jsonnet_output-files.golden |  20 +-
 .../minimal-config.jsonnet_single-file.golden |  20 +-
 ...eploy-parallel.jsonnet_output-files.golden |  20 +-
 ...deploy-parallel.jsonnet_single-file.golden |  20 +-
 ...odeploy-serial.jsonnet_output-files.golden |  24 +-
 ...todeploy-serial.jsonnet_single-file.golden |  24 +-
 ...de-final-stage.jsonnet_output-files.golden |  24 +-
 ...ide-final-stage.jsonnet_single-file.golden |  24 +-
 32 files changed, 542 insertions(+), 330 deletions(-)

diff --git a/test/pipedream.js b/test/pipedream.js
index 71c853e..aca5c41 100644
--- a/test/pipedream.js
+++ b/test/pipedream.js
@@ -9,6 +9,7 @@ test("ensure manual deploys is expected structure in serial", async (t) => {
 
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.truthy(got.pipelines["deploy-example"]);
+  t.truthy(got.pipelines["deploy-example-s4s2"]);
   t.truthy(got.pipelines["deploy-example-s4s"]);
 
   // Ensure the trigger has the right initial material
@@ -22,9 +23,9 @@ test("ensure manual deploys is expected structure in serial", async (t) => {
     },
   });
 
-  // Ensure s4s depends on the trigger material
-  const s4s = got.pipelines["deploy-example-s4s"];
-  t.deepEqual(s4s.materials, {
+  // Ensure s4s2 depends on the trigger material (first prod region)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
     "deploy-example-pipeline-complete": {
       pipeline: "deploy-example",
       stage: "pipeline-complete",
@@ -36,6 +37,21 @@ test("ensure manual deploys is expected structure in serial", async (t) => {
       shallow_clone: true,
     },
   });
+
+  // Ensure s4s depends on s4s2
+  const s4s = got.pipelines["deploy-example-s4s"];
+  t.deepEqual(s4s.materials, {
+    "deploy-example-s4s2-pipeline-complete": {
+      pipeline: "deploy-example-s4s2",
+      stage: "pipeline-complete",
+    },
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
 });
 
 test("ensure manual deploys is expected structure in parallel", async (t) => {
@@ -46,6 +62,7 @@ test("ensure manual deploys is expected structure in parallel", async (t) => {
 
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.truthy(got.pipelines["deploy-example"]);
+  t.truthy(got.pipelines["deploy-example-s4s2"]);
   t.truthy(got.pipelines["deploy-example-s4s"]);
 
   // Ensure the trigger has the right initial material
@@ -59,7 +76,22 @@ test("ensure manual deploys is expected structure in parallel", async (t) => {
     },
   });
 
-  // Ensure s4s depends on the trigger material
+  // Ensure s4s2 depends on the trigger material (first prod region in parallel)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    "deploy-example-pipeline-complete": {
+      pipeline: "deploy-example",
+      stage: "pipeline-complete",
+    },
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure s4s also depends on the trigger material (parallel deploy)
   const s4s = got.pipelines["deploy-example-s4s"];
   t.deepEqual(s4s.materials, {
     "deploy-example-pipeline-complete": {
@@ -83,12 +115,28 @@ test("ensure auto deploys is expected structure in serial", async (t) => {
 
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.falsy(got.pipelines["deploy-example"]);
+  t.truthy(got.pipelines["deploy-example-s4s2"]);
   t.truthy(got.pipelines["deploy-example-s4s"]);
   t.truthy(got.pipelines["rollback-example"]);
 
-  // Ensure s4s has just the repo material
+  // Ensure s4s2 has just the repo material (first region)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure s4s depends on s4s2
   const s4s = got.pipelines["deploy-example-s4s"];
   t.deepEqual(s4s.materials, {
+    "deploy-example-s4s2-pipeline-complete": {
+      pipeline: "deploy-example-s4s2",
+      stage: "pipeline-complete",
+    },
     example_repo: {
       branch: "master",
       destination: "example",
@@ -100,10 +148,10 @@ test("ensure auto deploys is expected structure in serial", async (t) => {
   const r = got.pipelines["rollback-example"];
   t.deepEqual(r["environment_variables"], {
     ALL_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     GOCD_ACCESS_TOKEN: "{{SECRET:[devinfra][gocd_access_token]}}",
     REGION_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     ROLLBACK_MATERIAL_NAME: "example_repo",
     ROLLBACK_STAGE: "example_stage",
     TRIGGERED_BY: "",
@@ -125,10 +173,22 @@ test("ensure auto deploys is expected structure in parallel", async (t) => {
 
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.falsy(got.pipelines["deploy-example"]);
+  t.truthy(got.pipelines["deploy-example-s4s2"]);
   t.truthy(got.pipelines["deploy-example-s4s"]);
   t.truthy(got.pipelines["rollback-example"]);
 
-  // Ensure s4s has just the repo material
+  // Ensure s4s2 has just the repo material (parallel deploy, no upstream)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure s4s also has just the repo material (parallel deploy)
   const s4s = got.pipelines["deploy-example-s4s"];
   t.deepEqual(s4s.materials, {
     example_repo: {
@@ -142,10 +202,10 @@ test("ensure auto deploys is expected structure in parallel", async (t) => {
   const r = got.pipelines["rollback-example"];
   t.deepEqual(r["environment_variables"], {
     ALL_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     GOCD_ACCESS_TOKEN: "{{SECRET:[devinfra][gocd_access_token]}}",
     REGION_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     ROLLBACK_MATERIAL_NAME: "example_repo",
     ROLLBACK_STAGE: "example_stage",
     TRIGGERED_BY: "",
@@ -175,9 +235,24 @@ test("ensure exclude regions removes regions without trigger pipeline in serial"
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
+  // Ensure s4s2 has just the repo material (first region after exclusions)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure de depends on s4s2
   const de = got.pipelines["deploy-example-de"];
   t.deepEqual(de.materials, {
+    "deploy-example-s4s2-pipeline-complete": {
+      pipeline: "deploy-example-s4s2",
+      stage: "pipeline-complete",
+    },
     example_repo: {
       branch: "master",
       destination: "example",
@@ -207,11 +282,11 @@ test("ensure exclude regions removes regions without trigger pipeline in serial"
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
@@ -231,7 +306,18 @@ test("ensure exclude regions removes regions without trigger pipeline in paralle
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
+  // Ensure s4s2 has just the repo material (parallel deploy)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure de has just the repo material (parallel deploy)
   const de = got.pipelines["deploy-example-de"];
   t.deepEqual(de.materials, {
     example_repo: {
@@ -242,7 +328,7 @@ test("ensure exclude regions removes regions without trigger pipeline in paralle
     },
   });
 
-  // Ensure customer-2 has pipeline material too
+  // Ensure customer-2 has just the repo material (parallel deploy)
   const c2 = got.pipelines["deploy-example-customer-2"];
   t.deepEqual(c2.materials, {
     example_repo: {
@@ -259,11 +345,11 @@ test("ensure exclude regions removes regions without trigger pipeline in paralle
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
@@ -284,9 +370,9 @@ test("ensure exclude regions removes regions with trigger pipeline in serial", a
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
-  const de = got.pipelines["deploy-example-de"];
-  t.deepEqual(de.materials, {
+  // Ensure s4s2 depends on trigger (first region after exclusions, serial)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
     "deploy-example-pipeline-complete": {
       pipeline: "deploy-example",
       stage: "pipeline-complete",
@@ -299,6 +385,21 @@ test("ensure exclude regions removes regions with trigger pipeline in serial", a
     },
   });
 
+  // Ensure de depends on s4s2
+  const de = got.pipelines["deploy-example-de"];
+  t.deepEqual(de.materials, {
+    "deploy-example-s4s2-pipeline-complete": {
+      pipeline: "deploy-example-s4s2",
+      stage: "pipeline-complete",
+    },
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
   // Ensure customer-2 has pipeline material too
   const c2 = got.pipelines["deploy-example-customer-2"];
   t.deepEqual(c2.materials, {
@@ -320,11 +421,11 @@ test("ensure exclude regions removes regions with trigger pipeline in serial", a
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
@@ -345,7 +446,22 @@ test("ensure exclude regions removes regions with trigger pipeline in parallel",
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
+  // Ensure s4s2 depends on trigger (parallel deploy)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    "deploy-example-pipeline-complete": {
+      pipeline: "deploy-example",
+      stage: "pipeline-complete",
+    },
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure de depends on trigger (parallel deploy)
   const de = got.pipelines["deploy-example-de"];
   t.deepEqual(de.materials, {
     "deploy-example-pipeline-complete": {
@@ -360,7 +476,7 @@ test("ensure exclude regions removes regions with trigger pipeline in parallel",
     },
   });
 
-  // Ensure customer-2 has pipeline material too
+  // Ensure customer-2 depends on trigger (parallel deploy)
   const c2 = got.pipelines["deploy-example-customer-2"];
   t.deepEqual(c2.materials, {
     "deploy-example-pipeline-complete": {
@@ -381,11 +497,11 @@ test("ensure exclude regions removes regions with trigger pipeline in parallel",
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
@@ -406,9 +522,24 @@ test("ensure include regions adds regions without trigger pipeline in serial", a
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
+  // Ensure s4s2 has just the repo material (first region)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure de depends on s4s2
   const de = got.pipelines["deploy-example-de"];
   t.deepEqual(de.materials, {
+    "deploy-example-s4s2-pipeline-complete": {
+      pipeline: "deploy-example-s4s2",
+      stage: "pipeline-complete",
+    },
     example_repo: {
       branch: "master",
       destination: "example",
@@ -417,7 +548,7 @@ test("ensure include regions adds regions without trigger pipeline in serial", a
     },
   });
 
-  // Ensure control is included
+  // Ensure control depends on de
   const control = got.pipelines["deploy-example-control"];
   t.deepEqual(control.materials, {
     "deploy-example-de-pipeline-complete": {
@@ -468,11 +599,11 @@ test("ensure include regions adds regions without trigger pipeline in serial", a
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
@@ -493,7 +624,18 @@ test("ensure include regions adds regions without trigger pipeline in parallel",
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
+  // Ensure s4s2 has just the repo material (parallel deploy)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure de has just the repo material (parallel deploy)
   const de = got.pipelines["deploy-example-de"];
   t.deepEqual(de.materials, {
     example_repo: {
@@ -504,7 +646,7 @@ test("ensure include regions adds regions without trigger pipeline in parallel",
     },
   });
 
-  // Ensure control is included
+  // Ensure control has just the repo material (parallel deploy)
   const control = got.pipelines["deploy-example-control"];
   t.deepEqual(control.materials, {
     example_repo: {
@@ -515,7 +657,7 @@ test("ensure include regions adds regions without trigger pipeline in parallel",
     },
   });
 
-  // Ensure customer-1 depends on control
+  // Ensure customer-1 has just the repo material (parallel deploy)
   const c1 = got.pipelines["deploy-example-customer-1"];
   t.deepEqual(c1.materials, {
     example_repo: {
@@ -526,7 +668,7 @@ test("ensure include regions adds regions without trigger pipeline in parallel",
     },
   });
 
-  // Ensure customer-2 has pipeline material too
+  // Ensure customer-2 has just the repo material (parallel deploy)
   const c2 = got.pipelines["deploy-example-customer-2"];
   t.deepEqual(c2.materials, {
     example_repo: {
@@ -543,11 +685,11 @@ test("ensure include regions adds regions without trigger pipeline in parallel",
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
@@ -569,7 +711,22 @@ test("ensure include regions adds regions with trigger pipeline in parallel", as
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
+  // Ensure s4s2 depends on the trigger (parallel deploy)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
+    "deploy-example-pipeline-complete": {
+      pipeline: "deploy-example",
+      stage: "pipeline-complete",
+    },
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure de depends on the trigger (parallel deploy)
   const de = got.pipelines["deploy-example-de"];
   t.deepEqual(de.materials, {
     "deploy-example-pipeline-complete": {
@@ -584,7 +741,7 @@ test("ensure include regions adds regions with trigger pipeline in parallel", as
     },
   });
 
-  // Ensure control is included and also depends on the trigger pipeline
+  // Ensure control depends on the trigger (parallel deploy)
   const control = got.pipelines["deploy-example-control"];
   t.deepEqual(control.materials, {
     "deploy-example-pipeline-complete": {
@@ -599,7 +756,7 @@ test("ensure include regions adds regions with trigger pipeline in parallel", as
     },
   });
 
-  // Ensure customer-1 depends on control
+  // Ensure customer-1 depends on the trigger (parallel deploy)
   const c1 = got.pipelines["deploy-example-customer-1"];
   t.deepEqual(c1.materials, {
     "deploy-example-pipeline-complete": {
@@ -614,7 +771,7 @@ test("ensure include regions adds regions with trigger pipeline in parallel", as
     },
   });
 
-  // Ensure customer-2 has pipeline material too
+  // Ensure customer-2 depends on the trigger (parallel deploy)
   const c2 = got.pipelines["deploy-example-customer-2"];
   t.deepEqual(c2.materials, {
     "deploy-example-pipeline-complete": {
@@ -648,9 +805,9 @@ test("ensure include regions adds regions with trigger pipeline in serial", asyn
     "rollback-example",
   ]);
 
-  // Ensure de has just the repo material
-  const de = got.pipelines["deploy-example-de"];
-  t.deepEqual(de.materials, {
+  // Ensure s4s2 depends on the trigger (first region)
+  const s4s2 = got.pipelines["deploy-example-s4s2"];
+  t.deepEqual(s4s2.materials, {
     "deploy-example-pipeline-complete": {
       pipeline: "deploy-example",
       stage: "pipeline-complete",
@@ -663,7 +820,22 @@ test("ensure include regions adds regions with trigger pipeline in serial", asyn
     },
   });
 
-  // Ensure control is included
+  // Ensure de depends on s4s2
+  const de = got.pipelines["deploy-example-de"];
+  t.deepEqual(de.materials, {
+    "deploy-example-s4s2-pipeline-complete": {
+      pipeline: "deploy-example-s4s2",
+      stage: "pipeline-complete",
+    },
+    example_repo: {
+      branch: "master",
+      destination: "example",
+      git: "git@github.com:getsentry/example.git",
+      shallow_clone: true,
+    },
+  });
+
+  // Ensure control depends on de
   const control = got.pipelines["deploy-example-control"];
   t.deepEqual(control.materials, {
     "deploy-example-de-pipeline-complete": {
@@ -714,11 +886,11 @@ test("ensure include regions adds regions with trigger pipeline in serial", asyn
   const regionPipelines = r.environment_variables["REGION_PIPELINE_FLAGS"];
   t.deepEqual(
     allPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
   );
   t.deepEqual(
     regionPipelines,
-    "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+    "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
   );
 });
 
diff --git a/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden b/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden
index 487b865..001e1ca 100644
--- a/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden
+++ b/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden
@@ -1,5 +1,6 @@
 {
    "all_regions": [
+      "s4s2",
       "s4s",
       "de",
       "us",
@@ -8,7 +9,6 @@
       "customer-1",
       "customer-2",
       "customer-4",
-      "customer-7",
-      "s4s2"
+      "customer-7"
    ]
 }
diff --git a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden
index 67a5f6d..516fa25 100644
--- a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -41,7 +41,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -79,7 +79,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -117,7 +117,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 8,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -155,7 +155,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -193,7 +193,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -231,7 +231,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 9,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -269,7 +269,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -309,9 +309,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden
index 5805b98..9995c83 100644
--- a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -68,7 +68,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -101,7 +101,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 8,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -134,7 +134,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -167,7 +167,7 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -200,7 +200,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 9,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -233,7 +233,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -268,9 +268,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden
index 59974d9..07404e6 100644
--- a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 8,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -171,7 +171,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-s4s-pipeline-complete": {
@@ -213,9 +213,13 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
+                  "stage": "pipeline-complete"
+               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -251,7 +255,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 9,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -289,7 +293,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -333,9 +337,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden
index d943dac..c72cc25 100644
--- a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -39,7 +39,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -76,7 +76,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -113,7 +113,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 8,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -150,7 +150,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-s4s-pipeline-complete": {
@@ -187,9 +187,13 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
+               "stage": "pipeline-complete"
+            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -220,7 +224,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 9,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -253,7 +257,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -292,9 +296,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_output-files.golden
index 8124781..7bc8970 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -41,7 +41,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -79,7 +79,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -117,7 +117,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -155,7 +155,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -193,7 +193,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 7,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -233,9 +233,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_single-file.golden
index e48f25a..fe16ddc 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -68,7 +68,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -101,7 +101,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -134,7 +134,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -167,7 +167,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 7,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -202,9 +202,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_output-files.golden
index 85c8114..2eb7656 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -171,9 +171,13 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
+                  "stage": "pipeline-complete"
+               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -209,7 +213,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 7,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -249,9 +253,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_single-file.golden
index 18b1705..1c6c8cc 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -39,7 +39,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -76,7 +76,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -113,7 +113,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -150,9 +150,13 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
+               "stage": "pipeline-complete"
+            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -183,7 +187,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 7,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -218,9 +222,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_output-files.golden
index c47fae4..b7cc85d 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -171,7 +171,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -213,7 +213,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 7,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -294,9 +294,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_single-file.golden
index 3067684..9469944 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-parallel.jsonnet_single-file.golden
@@ -34,7 +34,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -71,7 +71,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -108,7 +108,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -145,7 +145,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -182,7 +182,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -219,7 +219,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 7,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -258,9 +258,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_output-files.golden
index 5050f16..9a76eab 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -171,11 +171,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-pipeline-complete": {
-                  "pipeline": "deploy-example",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -213,7 +213,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 7,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -294,9 +294,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_single-file.golden
index 30cdad0..1ec996a 100644
--- a/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/exclude-regions-no-autodeploy-serial.jsonnet_single-file.golden
@@ -34,7 +34,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -71,7 +71,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -108,7 +108,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -145,7 +145,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -182,11 +182,11 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-pipeline-complete": {
-               "pipeline": "deploy-example",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -219,7 +219,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 7,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -258,9 +258,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_output-files.golden
index 9c57182..d09afb9 100644
--- a/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-control": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -41,7 +41,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -79,7 +79,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -117,7 +117,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -155,7 +155,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -193,7 +193,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -231,7 +231,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 8,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -271,9 +271,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_single-file.golden
index 5bd4748..8f64228 100644
--- a/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/include-regions-autodeploy-parallel.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-control": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -68,7 +68,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -101,7 +101,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -134,7 +134,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -167,7 +167,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -200,7 +200,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 8,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -235,9 +235,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_output-files.golden
index 9b39f28..dbb8d49 100644
--- a/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-control": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-control-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -171,7 +171,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -213,9 +213,13 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
+                  "stage": "pipeline-complete"
+               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -251,7 +255,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 8,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -291,9 +295,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_single-file.golden
index 9d4babb..d6599d6 100644
--- a/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/include-regions-autodeploy-serial.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-control": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -39,7 +39,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-control-pipeline-complete": {
@@ -76,7 +76,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -113,7 +113,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -150,7 +150,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -187,9 +187,13 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
+               "stage": "pipeline-complete"
+            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -220,7 +224,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 8,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -255,9 +259,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_output-files.golden
index 1a193f5..9a2d60a 100644
--- a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-control": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -171,7 +171,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -213,7 +213,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -255,7 +255,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 8,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -336,9 +336,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_single-file.golden
index 2a30e46..a3155e2 100644
--- a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-parallel.jsonnet_single-file.golden
@@ -34,7 +34,7 @@
          ]
       },
       "deploy-example-control": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -71,7 +71,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -108,7 +108,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -145,7 +145,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -182,7 +182,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -219,7 +219,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -256,7 +256,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 8,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -295,9 +295,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_output-files.golden
index 5246d44..afed347 100644
--- a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-control": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-control-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -171,7 +171,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -213,11 +213,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-pipeline-complete": {
-                  "pipeline": "deploy-example",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -255,7 +255,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 8,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -336,9 +336,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_single-file.golden
index b298137..9417390 100644
--- a/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/include-regions-no-autodeploy-serial.jsonnet_single-file.golden
@@ -34,7 +34,7 @@
          ]
       },
       "deploy-example-control": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -71,7 +71,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-control-pipeline-complete": {
@@ -108,7 +108,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -145,7 +145,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -182,7 +182,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -219,11 +219,11 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-pipeline-complete": {
-               "pipeline": "deploy-example",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -256,7 +256,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 8,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -295,9 +295,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_output-files.golden
index 9c57182..d09afb9 100644
--- a/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-control": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -41,7 +41,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -79,7 +79,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -117,7 +117,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -155,7 +155,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -193,7 +193,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -231,7 +231,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 8,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -271,9 +271,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_single-file.golden
index 5bd4748..8f64228 100644
--- a/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/include-regions-parallel.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-control": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -68,7 +68,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -101,7 +101,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -134,7 +134,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -167,7 +167,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -200,7 +200,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 8,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -235,9 +235,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-control --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden
index d99dae4..3b907ab 100644
--- a/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 8,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -171,7 +171,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-s4s-pipeline-complete": {
@@ -213,9 +213,13 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
+                  "stage": "pipeline-complete"
+               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -251,7 +255,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 9,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -289,7 +293,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
diff --git a/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden
index fff7037..17fee3a 100644
--- a/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -39,7 +39,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -76,7 +76,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -113,7 +113,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 8,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -150,7 +150,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-s4s-pipeline-complete": {
@@ -187,9 +187,13 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
+               "stage": "pipeline-complete"
+            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -220,7 +224,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 9,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -253,7 +257,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden
index af81248..f16f7b5 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -78,7 +78,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -153,7 +153,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -228,7 +228,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 8,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -303,7 +303,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -378,7 +378,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -453,7 +453,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 9,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -528,7 +528,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -643,9 +643,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden
index eea342b..d64a2e3 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -105,7 +105,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -175,7 +175,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -245,7 +245,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 8,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -315,7 +315,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -385,7 +385,7 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -455,7 +455,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 9,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -525,7 +525,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -597,9 +597,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden
index 14eea13..f9c4786 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -78,7 +78,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -153,7 +153,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -228,7 +228,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 8,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -303,7 +303,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-s4s-pipeline-complete": {
@@ -378,11 +378,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-pipeline-complete": {
-                  "pipeline": "deploy-example",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -453,7 +453,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 9,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -528,7 +528,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -643,9 +643,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden
index fdf9abd..276d418 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -105,7 +105,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -175,7 +175,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -245,7 +245,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 8,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -315,7 +315,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-s4s-pipeline-complete": {
@@ -385,11 +385,11 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-pipeline-complete": {
-               "pipeline": "deploy-example",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -455,7 +455,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 9,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -525,7 +525,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -597,9 +597,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden
index 54fbdae..f81d777 100644
--- a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 5,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -48,7 +48,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 6,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -93,7 +93,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 7,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -138,7 +138,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 8,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -183,7 +183,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 3,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-s4s-pipeline-complete": {
@@ -228,9 +228,13 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 2,
+            "display_order": 3,
             "group": "example",
             "materials": {
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
+                  "stage": "pipeline-complete"
+               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -269,7 +273,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s2": {
-            "display_order": 9,
+            "display_order": 2,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -310,7 +314,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 4,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -357,9 +361,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden
index 99a03e1..033e36e 100644
--- a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 5,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -42,7 +42,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 6,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -82,7 +82,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 7,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -122,7 +122,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 8,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -162,7 +162,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 3,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-s4s-pipeline-complete": {
@@ -202,9 +202,13 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 2,
+         "display_order": 3,
          "group": "example",
          "materials": {
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
+               "stage": "pipeline-complete"
+            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -238,7 +242,7 @@
          ]
       },
       "deploy-example-s4s2": {
-         "display_order": 9,
+         "display_order": 2,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -274,7 +278,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 4,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -316,9 +320,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""

From 732d72a15f67d28211e1889722857e818036ad90 Mon Sep 17 00:00:00 2001
From: Dmitrii Fedorov <dmitrii.fedorov@sentry.io>
Date: Mon, 5 Jan 2026 09:58:27 -0800
Subject: [PATCH 3/3] -s4s to test regions

---
 libs/getsentry.libsonnet                      |  2 +-
 test/pipedream.js                             | 32 +++++++++----------
 .../regions.jsonnet_output-files.golden       |  4 +--
 ...eploy-parallel.jsonnet_output-files.golden | 18 +++++------
 ...deploy-parallel.jsonnet_single-file.golden | 18 +++++------
 ...odeploy-serial.jsonnet_output-files.golden | 26 +++++++--------
 ...todeploy-serial.jsonnet_single-file.golden | 26 +++++++--------
 ...minimal-config.jsonnet_output-files.golden | 22 ++++++-------
 .../minimal-config.jsonnet_single-file.golden | 22 ++++++-------
 ...eploy-parallel.jsonnet_output-files.golden | 18 +++++------
 ...deploy-parallel.jsonnet_single-file.golden | 18 +++++------
 ...odeploy-serial.jsonnet_output-files.golden | 26 +++++++--------
 ...todeploy-serial.jsonnet_single-file.golden | 26 +++++++--------
 ...de-final-stage.jsonnet_output-files.golden | 26 +++++++--------
 ...ide-final-stage.jsonnet_single-file.golden | 26 +++++++--------
 15 files changed, 142 insertions(+), 168 deletions(-)

diff --git a/libs/getsentry.libsonnet b/libs/getsentry.libsonnet
index 89e6fbb..fb6e95a 100644
--- a/libs/getsentry.libsonnet
+++ b/libs/getsentry.libsonnet
@@ -6,7 +6,6 @@
   // These regions are user facing deployments
   prod_regions: [
     's4s2',
-    's4s',
     'de',
     'us',
     // 'control' is excluded by default and must be explicitly included
@@ -20,6 +19,7 @@
   ],
   // Test regions will deploy in parallel to the regions above
   test_regions: [
+    's4s',
   ],
   is_st(region):: (region == 's4s' || std.startsWith(region, 'customer-')),
 }
diff --git a/test/pipedream.js b/test/pipedream.js
index aca5c41..bd913ec 100644
--- a/test/pipedream.js
+++ b/test/pipedream.js
@@ -10,7 +10,7 @@ test("ensure manual deploys is expected structure in serial", async (t) => {
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.truthy(got.pipelines["deploy-example"]);
   t.truthy(got.pipelines["deploy-example-s4s2"]);
-  t.truthy(got.pipelines["deploy-example-s4s"]);
+  t.truthy(got.pipelines["deploy-example-s4s"]); // s4s is now a test region
 
   // Ensure the trigger has the right initial material
   const trigger = got.pipelines["deploy-example"];
@@ -38,11 +38,11 @@ test("ensure manual deploys is expected structure in serial", async (t) => {
     },
   });
 
-  // Ensure s4s depends on s4s2
+  // Ensure s4s (test region) depends on trigger pipeline, deployed in parallel
   const s4s = got.pipelines["deploy-example-s4s"];
   t.deepEqual(s4s.materials, {
-    "deploy-example-s4s2-pipeline-complete": {
-      pipeline: "deploy-example-s4s2",
+    "deploy-example-pipeline-complete": {
+      pipeline: "deploy-example",
       stage: "pipeline-complete",
     },
     example_repo: {
@@ -116,10 +116,10 @@ test("ensure auto deploys is expected structure in serial", async (t) => {
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.falsy(got.pipelines["deploy-example"]);
   t.truthy(got.pipelines["deploy-example-s4s2"]);
-  t.truthy(got.pipelines["deploy-example-s4s"]);
+  t.truthy(got.pipelines["deploy-example-s4s"]); // s4s is now a test region
   t.truthy(got.pipelines["rollback-example"]);
 
-  // Ensure s4s2 has just the repo material (first region)
+  // Ensure s4s2 has just the repo material (first prod region)
   const s4s2 = got.pipelines["deploy-example-s4s2"];
   t.deepEqual(s4s2.materials, {
     example_repo: {
@@ -130,13 +130,9 @@ test("ensure auto deploys is expected structure in serial", async (t) => {
     },
   });
 
-  // Ensure s4s depends on s4s2
+  // Ensure s4s (test region) has just the repo material (deployed in parallel)
   const s4s = got.pipelines["deploy-example-s4s"];
   t.deepEqual(s4s.materials, {
-    "deploy-example-s4s2-pipeline-complete": {
-      pipeline: "deploy-example-s4s2",
-      stage: "pipeline-complete",
-    },
     example_repo: {
       branch: "master",
       destination: "example",
@@ -145,13 +141,14 @@ test("ensure auto deploys is expected structure in serial", async (t) => {
     },
   });
 
+  // Rollback only includes prod regions, not test regions
   const r = got.pipelines["rollback-example"];
   t.deepEqual(r["environment_variables"], {
     ALL_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     GOCD_ACCESS_TOKEN: "{{SECRET:[devinfra][gocd_access_token]}}",
     REGION_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     ROLLBACK_MATERIAL_NAME: "example_repo",
     ROLLBACK_STAGE: "example_stage",
     TRIGGERED_BY: "",
@@ -174,7 +171,7 @@ test("ensure auto deploys is expected structure in parallel", async (t) => {
   t.deepEqual(Object.keys(got), ["format_version", "pipelines"]);
   t.falsy(got.pipelines["deploy-example"]);
   t.truthy(got.pipelines["deploy-example-s4s2"]);
-  t.truthy(got.pipelines["deploy-example-s4s"]);
+  t.truthy(got.pipelines["deploy-example-s4s"]); // s4s is now a test region
   t.truthy(got.pipelines["rollback-example"]);
 
   // Ensure s4s2 has just the repo material (parallel deploy, no upstream)
@@ -188,7 +185,7 @@ test("ensure auto deploys is expected structure in parallel", async (t) => {
     },
   });
 
-  // Ensure s4s also has just the repo material (parallel deploy)
+  // Ensure s4s (test region) also has just the repo material (parallel deploy)
   const s4s = got.pipelines["deploy-example-s4s"];
   t.deepEqual(s4s.materials, {
     example_repo: {
@@ -199,13 +196,14 @@ test("ensure auto deploys is expected structure in parallel", async (t) => {
     },
   });
 
+  // Rollback only includes prod regions, not test regions
   const r = got.pipelines["rollback-example"];
   t.deepEqual(r["environment_variables"], {
     ALL_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     GOCD_ACCESS_TOKEN: "{{SECRET:[devinfra][gocd_access_token]}}",
     REGION_PIPELINE_FLAGS:
-      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+      "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
     ROLLBACK_MATERIAL_NAME: "example_repo",
     ROLLBACK_STAGE: "example_stage",
     TRIGGERED_BY: "",
diff --git a/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden b/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden
index 001e1ca..36a8859 100644
--- a/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden
+++ b/test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden
@@ -1,7 +1,6 @@
 {
    "all_regions": [
       "s4s2",
-      "s4s",
       "de",
       "us",
       "control",
@@ -9,6 +8,7 @@
       "customer-1",
       "customer-2",
       "customer-4",
-      "customer-7"
+      "customer-7",
+      "s4s"
    ]
 }
diff --git a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden
index 516fa25..d4bc49d 100644
--- a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 6,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -41,7 +41,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 7,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -79,7 +79,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 8,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -117,7 +117,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 9,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -155,7 +155,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 4,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -193,7 +193,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 3,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -269,7 +269,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 5,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "example_repo": {
@@ -309,9 +309,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden
index 9995c83..5c0f5a9 100644
--- a/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 6,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 7,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -68,7 +68,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 8,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -101,7 +101,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 9,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -134,7 +134,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 4,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -167,7 +167,7 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 3,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -233,7 +233,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 5,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "example_repo": {
@@ -268,9 +268,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden
index 07404e6..aa13c93 100644
--- a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 6,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 7,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 8,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 9,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -171,11 +171,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 4,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-s4s-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -213,13 +213,9 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 3,
+            "display_order": 9,
             "group": "example",
             "materials": {
-               "deploy-example-s4s2-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s2",
-                  "stage": "pipeline-complete"
-               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -293,7 +289,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 5,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -337,9 +333,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden
index c72cc25..d120485 100644
--- a/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 6,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -39,7 +39,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 7,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -76,7 +76,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 8,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -113,7 +113,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 9,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -150,11 +150,11 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 4,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-s4s-pipeline-complete": {
-               "pipeline": "deploy-example-s4s",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -187,13 +187,9 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 3,
+         "display_order": 9,
          "group": "example",
          "materials": {
-            "deploy-example-s4s2-pipeline-complete": {
-               "pipeline": "deploy-example-s4s2",
-               "stage": "pipeline-complete"
-            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -257,7 +253,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 5,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -296,9 +292,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden
index 3b907ab..e49465b 100644
--- a/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/minimal-config.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 6,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -45,7 +45,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 7,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 8,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 9,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -171,11 +171,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 4,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-s4s-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -213,13 +213,9 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 3,
+            "display_order": 9,
             "group": "example",
             "materials": {
-               "deploy-example-s4s2-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s2",
-                  "stage": "pipeline-complete"
-               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -293,7 +289,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 5,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
diff --git a/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden
index 17fee3a..4593ec9 100644
--- a/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/minimal-config.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 6,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -39,7 +39,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 7,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -76,7 +76,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 8,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -113,7 +113,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 9,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -150,11 +150,11 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 4,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-s4s-pipeline-complete": {
-               "pipeline": "deploy-example-s4s",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -187,13 +187,9 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 3,
+         "display_order": 9,
          "group": "example",
          "materials": {
-            "deploy-example-s4s2-pipeline-complete": {
-               "pipeline": "deploy-example-s4s2",
-               "stage": "pipeline-complete"
-            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -257,7 +253,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 5,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden
index f16f7b5..adaf7db 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 6,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -78,7 +78,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 7,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -153,7 +153,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 8,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -228,7 +228,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 9,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -303,7 +303,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 4,
+            "display_order": 3,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -378,7 +378,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 3,
+            "display_order": 9,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -528,7 +528,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 5,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-pipeline-complete": {
@@ -643,9 +643,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden
index d64a2e3..8ce6688 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-parallel.jsonnet_single-file.golden
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 6,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -105,7 +105,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 7,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -175,7 +175,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 8,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -245,7 +245,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 9,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -315,7 +315,7 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 4,
+         "display_order": 3,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -385,7 +385,7 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 3,
+         "display_order": 9,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -525,7 +525,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 5,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-pipeline-complete": {
@@ -597,9 +597,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden
index f9c4786..2635415 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 6,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -78,7 +78,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 7,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -153,7 +153,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 8,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -228,7 +228,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 9,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -303,11 +303,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 4,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-s4s-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -378,11 +378,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 3,
+            "display_order": 9,
             "group": "example",
             "materials": {
-               "deploy-example-s4s2-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s2",
+               "deploy-example-pipeline-complete": {
+                  "pipeline": "deploy-example",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -528,7 +528,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 5,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -643,9 +643,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden
index 276d418..ab88035 100644
--- a/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/no-autodeploy-serial.jsonnet_single-file.golden
@@ -35,7 +35,7 @@
          ]
       },
       "deploy-example-customer-1": {
-         "display_order": 6,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -105,7 +105,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 7,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -175,7 +175,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 8,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -245,7 +245,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 9,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -315,11 +315,11 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 4,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-s4s-pipeline-complete": {
-               "pipeline": "deploy-example-s4s",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -385,11 +385,11 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 3,
+         "display_order": 9,
          "group": "example",
          "materials": {
-            "deploy-example-s4s2-pipeline-complete": {
-               "pipeline": "deploy-example-s4s2",
+            "deploy-example-pipeline-complete": {
+               "pipeline": "deploy-example",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -525,7 +525,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 5,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -597,9 +597,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7 --pipeline=deploy-example",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden
index f81d777..878fc29 100644
--- a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden
+++ b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_output-files.golden
@@ -3,7 +3,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-1": {
-            "display_order": 6,
+            "display_order": 5,
             "group": "example",
             "materials": {
                "deploy-example-us-pipeline-complete": {
@@ -48,7 +48,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-2": {
-            "display_order": 7,
+            "display_order": 6,
             "group": "example",
             "materials": {
                "deploy-example-customer-1-pipeline-complete": {
@@ -93,7 +93,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-4": {
-            "display_order": 8,
+            "display_order": 7,
             "group": "example",
             "materials": {
                "deploy-example-customer-2-pipeline-complete": {
@@ -138,7 +138,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-customer-7": {
-            "display_order": 9,
+            "display_order": 8,
             "group": "example",
             "materials": {
                "deploy-example-customer-4-pipeline-complete": {
@@ -183,11 +183,11 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-de": {
-            "display_order": 4,
+            "display_order": 3,
             "group": "example",
             "materials": {
-               "deploy-example-s4s-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s",
+               "deploy-example-s4s2-pipeline-complete": {
+                  "pipeline": "deploy-example-s4s2",
                   "stage": "pipeline-complete"
                },
                "example_repo": {
@@ -228,13 +228,9 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-s4s": {
-            "display_order": 3,
+            "display_order": 9,
             "group": "example",
             "materials": {
-               "deploy-example-s4s2-pipeline-complete": {
-                  "pipeline": "deploy-example-s4s2",
-                  "stage": "pipeline-complete"
-               },
                "example_repo": {
                   "branch": "master",
                   "destination": "example",
@@ -314,7 +310,7 @@
       "format_version": 10,
       "pipelines": {
          "deploy-example-us": {
-            "display_order": 5,
+            "display_order": 4,
             "group": "example",
             "materials": {
                "deploy-example-de-pipeline-complete": {
@@ -361,9 +357,9 @@
          "rollback-example": {
             "display_order": 1,
             "environment_variables": {
-               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+               "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
                "ROLLBACK_MATERIAL_NAME": "example_repo",
                "ROLLBACK_STAGE": "example_stage",
                "TRIGGERED_BY": ""
diff --git a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden
index 033e36e..e3bf8a9 100644
--- a/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden
+++ b/test/testdata/goldens/pipedream/rollback-override-final-stage.jsonnet_single-file.golden
@@ -2,7 +2,7 @@
    "format_version": 10,
    "pipelines": {
       "deploy-example-customer-1": {
-         "display_order": 6,
+         "display_order": 5,
          "group": "example",
          "materials": {
             "deploy-example-us-pipeline-complete": {
@@ -42,7 +42,7 @@
          ]
       },
       "deploy-example-customer-2": {
-         "display_order": 7,
+         "display_order": 6,
          "group": "example",
          "materials": {
             "deploy-example-customer-1-pipeline-complete": {
@@ -82,7 +82,7 @@
          ]
       },
       "deploy-example-customer-4": {
-         "display_order": 8,
+         "display_order": 7,
          "group": "example",
          "materials": {
             "deploy-example-customer-2-pipeline-complete": {
@@ -122,7 +122,7 @@
          ]
       },
       "deploy-example-customer-7": {
-         "display_order": 9,
+         "display_order": 8,
          "group": "example",
          "materials": {
             "deploy-example-customer-4-pipeline-complete": {
@@ -162,11 +162,11 @@
          ]
       },
       "deploy-example-de": {
-         "display_order": 4,
+         "display_order": 3,
          "group": "example",
          "materials": {
-            "deploy-example-s4s-pipeline-complete": {
-               "pipeline": "deploy-example-s4s",
+            "deploy-example-s4s2-pipeline-complete": {
+               "pipeline": "deploy-example-s4s2",
                "stage": "pipeline-complete"
             },
             "example_repo": {
@@ -202,13 +202,9 @@
          ]
       },
       "deploy-example-s4s": {
-         "display_order": 3,
+         "display_order": 9,
          "group": "example",
          "materials": {
-            "deploy-example-s4s2-pipeline-complete": {
-               "pipeline": "deploy-example-s4s2",
-               "stage": "pipeline-complete"
-            },
             "example_repo": {
                "branch": "master",
                "destination": "example",
@@ -278,7 +274,7 @@
          ]
       },
       "deploy-example-us": {
-         "display_order": 5,
+         "display_order": 4,
          "group": "example",
          "materials": {
             "deploy-example-de-pipeline-complete": {
@@ -320,9 +316,9 @@
       "rollback-example": {
          "display_order": 1,
          "environment_variables": {
-            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
-            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
+            "REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
             "ROLLBACK_MATERIAL_NAME": "example_repo",
             "ROLLBACK_STAGE": "example_stage",
             "TRIGGERED_BY": ""