Updated staging setup