diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
index b02dc9feb..8b2d7cfb0 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json
@@ -6,7 +6,7 @@
       "id": "a",
       "type": "rectangle",
       "pos": {
-        "x": 40,
+        "x": 14,
         "y": 0
       },
       "width": 53,
@@ -45,18 +45,18 @@
     },
     {
       "id": "b",
-      "type": "rectangle",
+      "type": "cloud",
       "pos": {
         "x": 0,
         "y": 207
       },
-      "width": 133,
+      "width": 397,
       "height": 125,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
       "borderRadius": 0,
-      "fill": "B4",
+      "fill": "N7",
       "stroke": "B1",
       "shadow": false,
       "3d": false,
@@ -70,7 +70,7 @@
       "fields": null,
       "methods": null,
       "columns": null,
-      "label": "b",
+      "label": "a container label",
       "fontSize": 28,
       "fontFamily": "DEFAULT",
       "language": "",
@@ -78,7 +78,7 @@
       "italic": false,
       "bold": false,
       "underline": false,
-      "labelWidth": 13,
+      "labelWidth": 195,
       "labelHeight": 36,
       "labelPosition": "OUTSIDE_TOP_CENTER",
       "zIndex": 0,
@@ -88,7 +88,7 @@
       "id": "b.c",
       "type": "rectangle",
       "pos": {
-        "x": 40,
+        "x": 183,
         "y": 236
       },
       "width": 53,
@@ -129,7 +129,7 @@
       "id": "d",
       "type": "rectangle",
       "pos": {
-        "x": 40,
+        "x": 182,
         "y": 432
       },
       "width": 54,
@@ -165,6 +165,129 @@
       "labelPosition": "INSIDE_MIDDLE_CENTER",
       "zIndex": 0,
       "level": 1
+    },
+    {
+      "id": "e",
+      "type": "rectangle",
+      "pos": {
+        "x": 127,
+        "y": 0
+      },
+      "width": 53,
+      "height": 66,
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 2,
+      "borderRadius": 0,
+      "fill": "B6",
+      "stroke": "B1",
+      "shadow": false,
+      "3d": false,
+      "multiple": false,
+      "double-border": false,
+      "tooltip": "",
+      "link": "",
+      "icon": null,
+      "iconPosition": "",
+      "blend": false,
+      "fields": null,
+      "methods": null,
+      "columns": null,
+      "label": "e",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N1",
+      "italic": false,
+      "bold": true,
+      "underline": false,
+      "labelWidth": 8,
+      "labelHeight": 21,
+      "labelPosition": "INSIDE_MIDDLE_CENTER",
+      "zIndex": 0,
+      "level": 1
+    },
+    {
+      "id": "f",
+      "type": "rectangle",
+      "pos": {
+        "x": 240,
+        "y": 0
+      },
+      "width": 51,
+      "height": 66,
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 2,
+      "borderRadius": 0,
+      "fill": "B6",
+      "stroke": "B1",
+      "shadow": false,
+      "3d": false,
+      "multiple": false,
+      "double-border": false,
+      "tooltip": "",
+      "link": "",
+      "icon": null,
+      "iconPosition": "",
+      "blend": false,
+      "fields": null,
+      "methods": null,
+      "columns": null,
+      "label": "f",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N1",
+      "italic": false,
+      "bold": true,
+      "underline": false,
+      "labelWidth": 6,
+      "labelHeight": 21,
+      "labelPosition": "INSIDE_MIDDLE_CENTER",
+      "zIndex": 0,
+      "level": 1
+    },
+    {
+      "id": "g",
+      "type": "rectangle",
+      "pos": {
+        "x": 351,
+        "y": 0
+      },
+      "width": 54,
+      "height": 66,
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 2,
+      "borderRadius": 0,
+      "fill": "B6",
+      "stroke": "B1",
+      "shadow": false,
+      "3d": false,
+      "multiple": false,
+      "double-border": false,
+      "tooltip": "",
+      "link": "",
+      "icon": null,
+      "iconPosition": "",
+      "blend": false,
+      "fields": null,
+      "methods": null,
+      "columns": null,
+      "label": "g",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N1",
+      "italic": false,
+      "bold": true,
+      "underline": false,
+      "labelWidth": 9,
+      "labelHeight": 21,
+      "labelPosition": "INSIDE_MIDDLE_CENTER",
+      "zIndex": 0,
+      "level": 1
     }
   ],
   "connections": [
@@ -174,11 +297,11 @@
       "srcArrow": "none",
       "srcLabel": "",
       "dst": "b.c",
-      "dstArrow": "triangle",
+      "dstArrow": "filled-diamond",
       "dstLabel": "",
       "opacity": 1,
       "strokeDash": 0,
-      "strokeWidth": 2,
+      "strokeWidth": 8,
       "stroke": "B1",
       "label": "",
       "fontSize": 16,
@@ -194,20 +317,20 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 66.5,
+          "x": 40,
           "y": 66
         },
         {
-          "x": 66.5,
+          "x": 40,
           "y": 106
         },
         {
-          "x": 66.5,
-          "y": 180.1
+          "x": 68.5,
+          "y": 184.09704142011833
         },
         {
-          "x": 66.5,
-          "y": 236.5
+          "x": 182.5,
+          "y": 256.4852071005917
         }
       ],
       "isCurve": true,
@@ -222,11 +345,11 @@
       "srcArrow": "none",
       "srcLabel": "",
       "dst": "d",
-      "dstArrow": "triangle",
+      "dstArrow": "filled-diamond",
       "dstLabel": "",
       "opacity": 1,
       "strokeDash": 0,
-      "strokeWidth": 2,
+      "strokeWidth": 8,
       "stroke": "B1",
       "label": "",
       "fontSize": 16,
@@ -242,19 +365,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 66.5,
+          "x": 209,
           "y": 302.5
         },
         {
-          "x": 66.5,
+          "x": 209,
           "y": 326.1
         },
         {
-          "x": 66.5,
+          "x": 209,
           "y": 392
         },
         {
-          "x": 66.5,
+          "x": 209,
           "y": 432
         }
       ],
@@ -263,6 +386,150 @@
       "tooltip": "",
       "icon": null,
       "zIndex": 0
+    },
+    {
+      "id": "(e -> b.c)[0]",
+      "src": "e",
+      "srcArrow": "none",
+      "srcLabel": "",
+      "dst": "b.c",
+      "dstArrow": "filled-diamond",
+      "dstLabel": "",
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 8,
+      "stroke": "B1",
+      "label": "",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N2",
+      "italic": true,
+      "bold": false,
+      "underline": false,
+      "labelWidth": 0,
+      "labelHeight": 0,
+      "labelPosition": "",
+      "labelPercentage": 0,
+      "route": [
+        {
+          "x": 153,
+          "y": 66
+        },
+        {
+          "x": 153,
+          "y": 106
+        },
+        {
+          "x": 159.8,
+          "y": 180.1
+        },
+        {
+          "x": 187,
+          "y": 236.5
+        }
+      ],
+      "isCurve": true,
+      "animated": false,
+      "tooltip": "",
+      "icon": null,
+      "zIndex": 0
+    },
+    {
+      "id": "(f -> b)[0]",
+      "src": "f",
+      "srcArrow": "none",
+      "srcLabel": "",
+      "dst": "b",
+      "dstArrow": "filled-diamond",
+      "dstLabel": "",
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 8,
+      "stroke": "red",
+      "label": "",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N2",
+      "italic": true,
+      "bold": false,
+      "underline": false,
+      "labelWidth": 0,
+      "labelHeight": 0,
+      "labelPosition": "",
+      "labelPercentage": 0,
+      "route": [
+        {
+          "x": 265,
+          "y": 66
+        },
+        {
+          "x": 265,
+          "y": 106
+        },
+        {
+          "x": 265,
+          "y": 135.2
+        },
+        {
+          "x": 265,
+          "y": 212
+        }
+      ],
+      "isCurve": true,
+      "animated": false,
+      "tooltip": "",
+      "icon": null,
+      "zIndex": 0
+    },
+    {
+      "id": "(g -> b)[0]",
+      "src": "g",
+      "srcArrow": "none",
+      "srcLabel": "",
+      "dst": "b",
+      "dstArrow": "filled-diamond",
+      "dstLabel": "",
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 8,
+      "stroke": "B1",
+      "label": "",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N2",
+      "italic": true,
+      "bold": false,
+      "underline": false,
+      "labelWidth": 0,
+      "labelHeight": 0,
+      "labelPosition": "",
+      "labelPercentage": 0,
+      "route": [
+        {
+          "x": 377.5,
+          "y": 66
+        },
+        {
+          "x": 377.5,
+          "y": 106
+        },
+        {
+          "x": 377.6,
+          "y": 145.2
+        },
+        {
+          "x": 378,
+          "y": 262
+        }
+      ],
+      "isCurve": true,
+      "animated": false,
+      "tooltip": "",
+      "icon": null,
+      "zIndex": 0
     }
   ]
 }
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg
index 9bffbf424..dea3419a2 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><svg id="d2-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="337" height="702" viewBox="-102 -102 337 702"><rect x="-102.000000" y="-102.000000" width="337.000000" height="702.000000" class=" fill-N7" /><style type="text/css"><![CDATA[
+<?xml version="1.0" encoding="utf-8"?><svg id="d2-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="409" height="502" viewBox="-2 -2 409 502"><rect x="-2.000000" y="-2.000000" width="409.000000" height="502.000000" class=" fill-N7" /><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
 }
@@ -44,7 +44,7 @@
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="40.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="66.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="0.000000" y="207.000000" width="133.000000" height="125.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="66.500000" y="194.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">b</text></g><g id="d"><g class="shape" ><rect x="40.000000" y="432.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="67.000000" y="470.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="b.c"><g class="shape" ><rect x="40.000000" y="236.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="66.500000" y="274.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b.c)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 66.500000 68.000000 C 66.500000 106.000000 66.500000 180.100000 66.500000 232.500000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#922942994)" /></g><g id="(b.c -&gt; d)[0]"><path d="M 66.500000 304.500000 C 66.500000 326.100000 66.500000 392.000000 66.500000 428.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#922942994)" /></g><mask id="922942994" maskUnits="userSpaceOnUse" x="-102" y="-102" width="337" height="702">
-<rect x="-102" y="-102" width="337" height="702" fill="white"></rect>
+]]></script><g id="a"><g class="shape" ><rect x="14.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="40.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><path d="M 66 251 C 66 252 63 254 61 254 C 27 256 1 273 1 293 C 1 315 31 333 68 333 H 324 C 364 333 397 314 397 291 C 397 269 367 251 328 250 C 325 250 323 249 322 247 C 313 225 274 208 227 208 C 197 208 169 215 152 226 C 150 227 147 228 145 227 C 138 226 131 225 123 225 C 93 224 68 236 66 251 Z" class=" stroke-B1 fill-N7" style="stroke-width:2;" /></g><text x="198.500000" y="194.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">a container label</text></g><g id="d"><g class="shape" ><rect x="182.000000" y="432.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="209.000000" y="470.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="e"><g class="shape" ><rect x="127.000000" y="0.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="153.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">e</text></g><g id="f"><g class="shape" ><rect x="240.000000" y="0.000000" width="51.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="265.500000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">f</text></g><g id="g"><g class="shape" ><rect x="351.000000" y="0.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="378.000000" y="38.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="b.c"><g class="shape" ><rect x="183.000000" y="236.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="209.500000" y="274.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b.c)[0]"><marker id="mk-3366198419" markerWidth="88.000000" markerHeight="56.000000" refX="76.000000" refY="28.000000" viewBox="0.000000 0.000000 88.000000 56.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,28.000000 44.000000,0.000000 88.000000,28.000000 44.000000,56.000000" class="connection fill-B1" stroke-width="8" /> </marker><path d="M 40.000000 71.000000 C 40.000000 106.000000 68.500000 184.097041 171.525548 249.516606" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#3294808949)" /></g><g id="(b.c -&gt; d)[0]"><path d="M 209.000000 307.500000 C 209.000000 326.100000 209.000000 392.000000 209.000000 419.000000" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#3294808949)" /></g><g id="(e -&gt; b.c)[0]"><path d="M 153.000000 71.000000 C 153.000000 106.000000 159.800000 180.100000 181.352907 224.790587" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#3294808949)" /></g><g id="(f -&gt; b)[0]"><marker id="mk-925556245" markerWidth="88.000000" markerHeight="56.000000" refX="76.000000" refY="28.000000" viewBox="0.000000 0.000000 88.000000 56.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,28.000000 44.000000,0.000000 88.000000,28.000000 44.000000,56.000000" fill="red" class="connection" stroke-width="8" /> </marker><path d="M 265.000000 71.000000 C 265.000000 106.000000 265.000000 135.200000 265.000000 199.000000" stroke="red" fill="none" class="connection" style="stroke-width:8;" marker-end="url(#mk-925556245)" mask="url(#3294808949)" /></g><g id="(g -&gt; b)[0]"><path d="M 377.500000 71.000000 C 377.500000 106.000000 377.600000 145.200000 377.955480 249.000076" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#3294808949)" /></g><mask id="3294808949" maskUnits="userSpaceOnUse" x="-2" y="-2" width="409" height="502">
+<rect x="-2" y="-2" width="409" height="502" fill="white"></rect>
 
 </mask></svg>
\ No newline at end of file
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
index 862d7a6fc..c124141e8 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json
@@ -6,7 +6,7 @@
       "id": "a",
       "type": "rectangle",
       "pos": {
-        "x": 62,
+        "x": 12,
         "y": 12
       },
       "width": 53,
@@ -45,18 +45,18 @@
     },
     {
       "id": "b",
-      "type": "rectangle",
+      "type": "cloud",
       "pos": {
-        "x": 12,
-        "y": 153
+        "x": 26,
+        "y": 213
       },
-      "width": 153,
+      "width": 155,
       "height": 166,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
       "borderRadius": 0,
-      "fill": "B4",
+      "fill": "N7",
       "stroke": "B1",
       "shadow": false,
       "3d": false,
@@ -70,7 +70,7 @@
       "fields": null,
       "methods": null,
       "columns": null,
-      "label": "b",
+      "label": "a container label",
       "fontSize": 28,
       "fontFamily": "DEFAULT",
       "language": "",
@@ -78,7 +78,7 @@
       "italic": false,
       "bold": false,
       "underline": false,
-      "labelWidth": 13,
+      "labelWidth": 195,
       "labelHeight": 36,
       "labelPosition": "INSIDE_TOP_CENTER",
       "zIndex": 0,
@@ -88,8 +88,8 @@
       "id": "b.c",
       "type": "rectangle",
       "pos": {
-        "x": 62,
-        "y": 203
+        "x": 76,
+        "y": 263
       },
       "width": 53,
       "height": 66,
@@ -129,8 +129,8 @@
       "id": "d",
       "type": "rectangle",
       "pos": {
-        "x": 61,
-        "y": 394
+        "x": 75,
+        "y": 454
       },
       "width": 54,
       "height": 66,
@@ -165,6 +165,129 @@
       "labelPosition": "INSIDE_MIDDLE_CENTER",
       "zIndex": 0,
       "level": 1
+    },
+    {
+      "id": "e",
+      "type": "rectangle",
+      "pos": {
+        "x": 85,
+        "y": 12
+      },
+      "width": 53,
+      "height": 66,
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 2,
+      "borderRadius": 0,
+      "fill": "B6",
+      "stroke": "B1",
+      "shadow": false,
+      "3d": false,
+      "multiple": false,
+      "double-border": false,
+      "tooltip": "",
+      "link": "",
+      "icon": null,
+      "iconPosition": "",
+      "blend": false,
+      "fields": null,
+      "methods": null,
+      "columns": null,
+      "label": "e",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N1",
+      "italic": false,
+      "bold": true,
+      "underline": false,
+      "labelWidth": 8,
+      "labelHeight": 21,
+      "labelPosition": "INSIDE_MIDDLE_CENTER",
+      "zIndex": 0,
+      "level": 1
+    },
+    {
+      "id": "f",
+      "type": "rectangle",
+      "pos": {
+        "x": 158,
+        "y": 12
+      },
+      "width": 51,
+      "height": 66,
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 2,
+      "borderRadius": 0,
+      "fill": "B6",
+      "stroke": "B1",
+      "shadow": false,
+      "3d": false,
+      "multiple": false,
+      "double-border": false,
+      "tooltip": "",
+      "link": "",
+      "icon": null,
+      "iconPosition": "",
+      "blend": false,
+      "fields": null,
+      "methods": null,
+      "columns": null,
+      "label": "f",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N1",
+      "italic": false,
+      "bold": true,
+      "underline": false,
+      "labelWidth": 6,
+      "labelHeight": 21,
+      "labelPosition": "INSIDE_MIDDLE_CENTER",
+      "zIndex": 0,
+      "level": 1
+    },
+    {
+      "id": "g",
+      "type": "rectangle",
+      "pos": {
+        "x": 229,
+        "y": 12
+      },
+      "width": 54,
+      "height": 66,
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 2,
+      "borderRadius": 0,
+      "fill": "B6",
+      "stroke": "B1",
+      "shadow": false,
+      "3d": false,
+      "multiple": false,
+      "double-border": false,
+      "tooltip": "",
+      "link": "",
+      "icon": null,
+      "iconPosition": "",
+      "blend": false,
+      "fields": null,
+      "methods": null,
+      "columns": null,
+      "label": "g",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N1",
+      "italic": false,
+      "bold": true,
+      "underline": false,
+      "labelWidth": 9,
+      "labelHeight": 21,
+      "labelPosition": "INSIDE_MIDDLE_CENTER",
+      "zIndex": 0,
+      "level": 1
     }
   ],
   "connections": [
@@ -174,11 +297,11 @@
       "srcArrow": "none",
       "srcLabel": "",
       "dst": "b.c",
-      "dstArrow": "triangle",
+      "dstArrow": "filled-diamond",
       "dstLabel": "",
       "opacity": 1,
       "strokeDash": 0,
-      "strokeWidth": 2,
+      "strokeWidth": 8,
       "stroke": "B1",
       "label": "",
       "fontSize": 16,
@@ -194,12 +317,20 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 88.5,
+          "x": 38.5,
           "y": 78
         },
         {
-          "x": 88.5,
-          "y": 203
+          "x": 38.5,
+          "y": 118
+        },
+        {
+          "x": 93.83333333333333,
+          "y": 118
+        },
+        {
+          "x": 93.83333333333333,
+          "y": 263
         }
       ],
       "animated": false,
@@ -213,11 +344,11 @@
       "srcArrow": "none",
       "srcLabel": "",
       "dst": "d",
-      "dstArrow": "triangle",
+      "dstArrow": "filled-diamond",
       "dstLabel": "",
       "opacity": 1,
       "strokeDash": 0,
-      "strokeWidth": 2,
+      "strokeWidth": 8,
       "stroke": "B1",
       "label": "",
       "fontSize": 16,
@@ -233,12 +364,145 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 88.5,
-          "y": 269
+          "x": 102.66666666666666,
+          "y": 329
         },
         {
-          "x": 88.5,
-          "y": 394
+          "x": 102.66666666666666,
+          "y": 454
+        }
+      ],
+      "animated": false,
+      "tooltip": "",
+      "icon": null,
+      "zIndex": 0
+    },
+    {
+      "id": "(e -> b.c)[0]",
+      "src": "e",
+      "srcArrow": "none",
+      "srcLabel": "",
+      "dst": "b.c",
+      "dstArrow": "filled-diamond",
+      "dstLabel": "",
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 8,
+      "stroke": "B1",
+      "label": "",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N2",
+      "italic": true,
+      "bold": false,
+      "underline": false,
+      "labelWidth": 0,
+      "labelHeight": 0,
+      "labelPosition": "",
+      "labelPercentage": 0,
+      "route": [
+        {
+          "x": 111.5,
+          "y": 78
+        },
+        {
+          "x": 111.5,
+          "y": 263
+        }
+      ],
+      "animated": false,
+      "tooltip": "",
+      "icon": null,
+      "zIndex": 0
+    },
+    {
+      "id": "(f -> b)[0]",
+      "src": "f",
+      "srcArrow": "none",
+      "srcLabel": "",
+      "dst": "b",
+      "dstArrow": "filled-diamond",
+      "dstLabel": "",
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 8,
+      "stroke": "red",
+      "label": "",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N2",
+      "italic": true,
+      "bold": false,
+      "underline": false,
+      "labelWidth": 0,
+      "labelHeight": 0,
+      "labelPosition": "",
+      "labelPercentage": 0,
+      "route": [
+        {
+          "x": 183.5,
+          "y": 78
+        },
+        {
+          "x": 183.5,
+          "y": 118
+        },
+        {
+          "x": 121.5,
+          "y": 118
+        },
+        {
+          "x": 122,
+          "y": 213
+        }
+      ],
+      "animated": false,
+      "tooltip": "",
+      "icon": null,
+      "zIndex": 0
+    },
+    {
+      "id": "(g -> b)[0]",
+      "src": "g",
+      "srcArrow": "none",
+      "srcLabel": "",
+      "dst": "b",
+      "dstArrow": "filled-diamond",
+      "dstLabel": "",
+      "opacity": 1,
+      "strokeDash": 0,
+      "strokeWidth": 8,
+      "stroke": "B1",
+      "label": "",
+      "fontSize": 16,
+      "fontFamily": "DEFAULT",
+      "language": "",
+      "color": "N2",
+      "italic": true,
+      "bold": false,
+      "underline": false,
+      "labelWidth": 0,
+      "labelHeight": 0,
+      "labelPosition": "",
+      "labelPercentage": 0,
+      "route": [
+        {
+          "x": 256,
+          "y": 78
+        },
+        {
+          "x": 256,
+          "y": 168
+        },
+        {
+          "x": 131.5,
+          "y": 168
+        },
+        {
+          "x": 131,
+          "y": 218
         }
       ],
       "animated": false,
diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg
index 70a9551c7..934011400 100644
--- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg
+++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><svg id="d2-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="357" height="652" viewBox="-90 -90 357 652"><rect x="-90.000000" y="-90.000000" width="357.000000" height="652.000000" class=" fill-N7" /><style type="text/css"><![CDATA[
+<?xml version="1.0" encoding="utf-8"?><svg id="d2-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="275" height="512" viewBox="10 10 275 512"><rect x="10.000000" y="10.000000" width="275.000000" height="512.000000" class=" fill-N7" /><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
 }
@@ -44,7 +44,7 @@
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="62.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="88.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><rect x="12.000000" y="153.000000" width="153.000000" height="166.000000" class=" stroke-B1 fill-B4" style="stroke-width:2;" /></g><text x="88.500000" y="186.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">b</text></g><g id="d"><g class="shape" ><rect x="61.000000" y="394.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="88.000000" y="432.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="b.c"><g class="shape" ><rect x="62.000000" y="203.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="88.500000" y="241.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b.c)[0]"><marker id="mk-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 88.500000 80.000000 L 88.500000 199.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#2423714643)" /></g><g id="(b.c -&gt; d)[0]"><path d="M 88.500000 271.000000 L 88.500000 390.000000" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-3488378134)" mask="url(#2423714643)" /></g><mask id="2423714643" maskUnits="userSpaceOnUse" x="-90" y="-90" width="357" height="652">
-<rect x="-90" y="-90" width="357" height="652" fill="white"></rect>
+]]></script><g id="a"><g class="shape" ><rect x="12.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="38.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">a</text></g><g id="b"><g class="shape" ><path d="M 52 271 C 52 273 51 275 50 275 C 37 277 27 300 27 327 C 27 356 39 379 53 379 H 153 C 169 379 182 354 182 323 C 182 294 170 270 155 268 C 154 268 153 267 153 264 C 150 234 134 212 116 212 C 104 212 94 221 87 236 C 86 238 85 238 84 238 C 81 236 79 235 75 235 C 62 236 53 251 52 271 Z" class=" stroke-B1 fill-N7" style="stroke-width:2;" /></g><text x="103.382500" y="302.000000" class="text fill-N1" style="text-anchor:middle;font-size:28px">a container label</text></g><g id="d"><g class="shape" ><rect x="75.000000" y="454.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="102.000000" y="492.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">d</text></g><g id="e"><g class="shape" ><rect x="85.000000" y="12.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="111.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">e</text></g><g id="f"><g class="shape" ><rect x="158.000000" y="12.000000" width="51.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="183.500000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">f</text></g><g id="g"><g class="shape" ><rect x="229.000000" y="12.000000" width="54.000000" height="66.000000" class=" stroke-B1 fill-B6" style="stroke-width:2;" /></g><text x="256.000000" y="50.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">g</text></g><g id="b.c"><g class="shape" ><rect x="76.000000" y="263.000000" width="53.000000" height="66.000000" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="102.500000" y="301.500000" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">c</text></g><g id="(a -&gt; b.c)[0]"><marker id="mk-3366198419" markerWidth="88.000000" markerHeight="56.000000" refX="76.000000" refY="28.000000" viewBox="0.000000 0.000000 88.000000 56.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,28.000000 44.000000,0.000000 88.000000,28.000000 44.000000,56.000000" class="connection fill-B1" stroke-width="8" /> </marker><path d="M 38.500000 83.000000 L 38.500000 108.000000 S 38.500000 118.000000 48.500000 118.000000 L 83.833333 118.000000 S 93.833333 118.000000 93.833333 128.000000 L 93.833333 250.000000" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#4127103521)" /></g><g id="(b.c -&gt; d)[0]"><path d="M 102.666667 334.000000 L 102.666667 441.000000" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#4127103521)" /></g><g id="(e -&gt; b.c)[0]"><path d="M 111.500000 83.000000 L 111.500000 250.000000" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#4127103521)" /></g><g id="(f -&gt; b)[0]"><marker id="mk-925556245" markerWidth="88.000000" markerHeight="56.000000" refX="76.000000" refY="28.000000" viewBox="0.000000 0.000000 88.000000 56.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,28.000000 44.000000,0.000000 88.000000,28.000000 44.000000,56.000000" fill="red" class="connection" stroke-width="8" /> </marker><path d="M 183.500000 83.000000 L 183.500000 108.000000 S 183.500000 118.000000 173.500000 118.000000 L 131.500000 118.000000 S 121.500000 118.000000 121.552631 127.999861 L 121.931580 200.000180" stroke="red" fill="none" class="connection" style="stroke-width:8;" marker-end="url(#mk-925556245)" mask="url(#4127103521)" /></g><g id="(g -&gt; b)[0]"><path d="M 256.000000 83.000000 L 256.000000 158.000000 S 256.000000 168.000000 246.000000 168.000000 L 141.500000 168.000000 S 131.500000 168.000000 131.400005 177.999500 L 131.129994 205.000650" fill="none" class="connection stroke-B1" style="stroke-width:8;" marker-end="url(#mk-3366198419)" mask="url(#4127103521)" /></g><mask id="4127103521" maskUnits="userSpaceOnUse" x="10" y="10" width="275" height="512">
+<rect x="10" y="10" width="275" height="512" fill="white"></rect>
 
 </mask></svg>
\ No newline at end of file
diff --git a/e2etests/todo_test.go b/e2etests/todo_test.go
index 6bcb70b34..70cf11785 100644
--- a/e2etests/todo_test.go
+++ b/e2etests/todo_test.go
@@ -225,7 +225,19 @@ Office chatter: {
 		{
 			name: "container_label_edge_adjustment",
 			script: `
-a -> b.c -> d
+a -> b.c -> d: {style.stroke-width: 8; target-arrowhead.shape: diamond; target-arrowhead.style.filled: true}
+b.shape: cloud
+e -> b.c: {style.stroke-width: 8; target-arrowhead.shape: diamond; target-arrowhead.style.filled: true}
+f -> b: {
+	style: {
+		stroke: red
+		stroke-width: 8
+	}
+	target-arrowhead.shape: diamond
+	target-arrowhead.style.filled: true
+}
+g -> b: {style.stroke-width: 8; target-arrowhead.shape: diamond; target-arrowhead.style.filled: true}
+b: a container label
 `,
 		},
 	}