diff --git a/BUILD.bazel b/BUILD.bazel
index 332e08c..16be483 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -351,6 +351,10 @@ FAST_BUILD_SETTINGS = {
 
 SWEEP = {
     "base": {
+        "description": "Base settings, provides macro placement from hierarchical synthesis",
+        "variables": {
+            "GLOBAL_ROUTE_ARGS": "-congestion_iterations 30 -congestion_report_iter_step 5 -verbose",
+        },
     },
     "naja": {
         "renamed_inputs": {
@@ -361,80 +365,29 @@ SWEEP = {
         },
     },
     "1": {
-        "description": "Flattend with automatic macro placement",
+        "description": "Flattend, timing driven placement, CTS timing repair enabled",
         "variables": {
             "SYNTH_HIERARCHICAL": "0",
-            # Macro placement fails with 0.24, tweak initial conditions
-            "PLACE_DENSITY": "0.25",
-        },
-    },
-    "2": {
-        "description": "Macro placement as base, but with flattend synthesis",
-        "variables": {
-            "SYNTH_HIERARCHICAL": "0",
-            "MACRO_PLACEMENT_TCL": "$(location write_macro_placement)",
-        },
-        "stage_sources": {"floorplan": ["write_macro_placement"]},
-        "previous_stage": {
-            "floorplan": "BoomTile_1_synth",
-        },
-    },
-    "3": {
-        "description": "Same as base, only with CTS timing repair enabled",
-        "variables": {
-            "SKIP_CTS_REPAIR_TIMING": "0",
-        },
-        "previous_stage": {
-            "cts": "BoomTile_place",
-        },
-    },
-    "4": {
-        "description": "Same as base, but timing driven placement",
-        "variables": {
             "GPL_TIMING_DRIVEN": "1",
-        },
-        "previous_stage": {
-            "place": "BoomTile_floorplan",
-        },
-    },
-    "5": {
-        "description": "Same as base, but with flattend synthesis and CTS timing repair",
-        "variables": {
-            "SYNTH_HIERARCHICAL": "0",
             "SKIP_CTS_REPAIR_TIMING": "0",
             "MACRO_PLACEMENT_TCL": "$(location write_macro_placement)",
         },
-        "previous_stage": {
-            "cts": "BoomTile_2_place",
-        },
         "stage_sources": {"floorplan": ["write_macro_placement"]},
     },
-    "6": {
-        "description": "Same as base, but with flattend synthesis and CTS timing repair and timing driven placement",
+    "2": {
+        "description": "Flattend, timing driven placement, CTS timing repair enabled, last gasp timing repair",
         "variables": {
             "SYNTH_HIERARCHICAL": "0",
+            "GPL_TIMING_DRIVEN": "1",
             "SKIP_CTS_REPAIR_TIMING": "0",
             "MACRO_PLACEMENT_TCL": "$(location write_macro_placement)",
-            "GPL_TIMING_DRIVEN": "1",
+            "SKIP_LAST_GASP": "1",
         },
         "previous_stage": {
-            "place": "BoomTile_2_floorplan",
+            "floorplan": "BoomTile_1_synth",
         },
         "stage_sources": {"floorplan": ["write_macro_placement"]},
     },
-    "7": {
-        "description": "Flattend synthesis, CTS timing repair, timing driven placement and automatic macro placement",
-        "variables": {
-            "SYNTH_HIERARCHICAL": "0",
-            "SKIP_CTS_REPAIR_TIMING": "0",
-            "GPL_TIMING_DRIVEN": "1",
-            # Macro placement fails with 0.24, tweak initial conditions
-            "PLACE_DENSITY": "0.25",
-        },
-        "previous_stage": {
-            "place": "BoomTile_2_floorplan",
-        },
-    },
 }
 
 BOOMTILE_VARIABLES = SKIP_REPORT_METRICS | FAST_BUILD_SETTINGS | {