Fix: use the right variables for feature checkout