Fix staging process: first pass

Signed-off-by: zosrothko <zosrothko@orange.fr>