diff --git a/C4_Container.puml b/C4_Container.puml
index fce6508..e049a8c 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -46,4 +46,4 @@ endlegend
 ' Boundaries
 ' ##################################
 
-!define Container_Boundary(e_alias, e_label) rectangle "==e_label [Container]" <<boundary>> as e_alias
\ No newline at end of file
+!define Container_Boundary(e_alias, e_label) Boundary(e_alias, e_label, "Container")
\ No newline at end of file
diff --git a/C4_Context.puml b/C4_Context.puml
index 0552d8f..2947f78 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -78,4 +78,4 @@ endlegend
 ' Boundaries
 ' ##################################
 
-!define System_Boundary(e_alias, e_label) rectangle "==e_label [System]" <<boundary>> as e_alias
\ No newline at end of file
+!define System_Boundary(e_alias, e_label) Boundary(e_alias, e_label, "System")
\ No newline at end of file