diff --git a/match/match.py b/match/match.py
index 81721754..4aee1104 100644
--- a/match/match.py
+++ b/match/match.py
@@ -13,9 +13,9 @@ def __init__(self, game, team_color, coach_name=None, category="3v3"):
         super().__init__()
         self.game = game
         self.n_robots = CATEGORIES.get(category)
-        self.coach_name = coach_name
+        self.coach_name = os.environ.get('COACH_NAME', coach_name) 
         self.team_color = os.environ.get('TEAM_COLOR', team_color)
-        self.category = category
+        self.category = os.environ.get('CATEGORY', category)
 
         self.opposite_team_color = 'yellow' if self.team_color == 'blue' else 'blue'