diff --git a/rex.project/x86_64/units/dependencies.units b/rex.project/x86_64/units/dependencies.units
index efcdf79..2ad883d 100644
--- a/rex.project/x86_64/units/dependencies.units
+++ b/rex.project/x86_64/units/dependencies.units
@@ -13,8 +13,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -31,8 +31,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -49,8 +49,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -85,8 +85,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -103,8 +103,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -121,8 +121,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -139,8 +139,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -157,8 +157,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -175,8 +175,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -193,8 +193,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -211,8 +211,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -229,8 +229,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -265,8 +265,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -283,8 +283,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -301,8 +301,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -319,8 +319,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -355,8 +355,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -373,8 +373,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -391,8 +391,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	},
@@ -427,8 +427,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_group",
 		"supply_environment":		true,
 		"environment":  			"environments/dependencies.env.bash"
 	}
diff --git a/rex.project/x86_64/units/stage1.units b/rex.project/x86_64/units/stage1.units
index d43bf68..40d9e3d 100644
--- a/rex.project/x86_64/units/stage1.units
+++ b/rex.project/x86_64/units/stage1.units
@@ -13,8 +13,8 @@
 		"active":					true,
 		"required":					true,
 		"set_user_context":			true,
-		"user":         			"bagira",
-		"group":					"bagira",
+		"user":         			"$build_user",
+		"group":					"$build_user",
 		"supply_environment":		true,
 		"environment":  			"environments/stage1.env.bash"
 	},
@@ -49,8 +49,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"bagira",
-        "group":           "bagira",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage1.env.bash"
     },
@@ -67,8 +67,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"bagira",
-        "group":           "bagira",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage1.env.bash"
     },
@@ -85,8 +85,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"bagira",
-        "group":           "bagira",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage1.env.bash"
     },
@@ -103,8 +103,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"bagira",
-        "group":           "bagira",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage1.env.bash"
     },
@@ -121,8 +121,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"bagira",
-        "group":           "bagira",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage1.env.bash"
     },
@@ -139,8 +139,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"bagira",
-        "group":           "bagira",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage1.env.bash"
     }
diff --git a/rex.project/x86_64/units/stage2.units b/rex.project/x86_64/units/stage2.units
index 82d9f16..7aabeb2 100644
--- a/rex.project/x86_64/units/stage2.units
+++ b/rex.project/x86_64/units/stage2.units
@@ -13,8 +13,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -31,8 +31,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -49,8 +49,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -67,8 +67,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -85,8 +85,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -103,8 +103,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -121,8 +121,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -139,8 +139,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -157,8 +157,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -175,8 +175,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -193,8 +193,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -211,8 +211,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -229,8 +229,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -247,8 +247,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -265,8 +265,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -283,8 +283,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -301,8 +301,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },
@@ -319,8 +319,8 @@
         "active":       			true,
         "required":     			true,
 		"set_user_context": 		true,
-        "user":         			"phanes",
-        "group":        			"phanes",
+        "user":         			"$build_user",
+        "group":           "$build_group",
 		"supply_environment":		true,
         "environment":  			"environments/stage2.env.bash"
     },