More robustness for deploy recipe