Fix variables for dev and CI