Fix: use CURRENT_BRANCH not BRANCH
Fix: $BRANCH is deprecated