diff --git a/infra/bots/recipe_modules/flavor/docker.py b/infra/bots/recipe_modules/flavor/docker.py
index 60cf5f6..1b6d701 100644
--- a/infra/bots/recipe_modules/flavor/docker.py
+++ b/infra/bots/recipe_modules/flavor/docker.py
@@ -39,8 +39,7 @@
     return None
 
   def step(self, name, cmd, **unused_kwargs):
-    extra_tokens = self.m.vars.extra_tokens
-    extra_tokens.remove('Docker')
+    extra_tokens = [t for t in self.m.vars.extra_tokens if t != 'Docker']
     os = self.m.vars.builder_cfg.get('os', '')
     model = self.m.vars.builder_cfg.get('model', '')
     cpu_or_gpu = self.m.vars.builder_cfg.get('cpu_or_gpu', '')