Scottish Baccalaureate - Social Sciences

I'm thinking about doing a Scottish Baccalaureate in Social Sciences. I'm currently in 4th year and plan to do the qualification over 2 years. I'm studying next year:

-H English
-H Maths
-H History
-H Geography
-H Physic/Chemistry (currently Physics, may ask to change before change of timetable after study leave)

In sixth year I'd like to study (depending on grades, of course!):

-AH English/Maths
-AH Geography
-AH History
-AH/H Music or H Modern Studies

I'd like to count my H Geography this year towards my baccalaureate, if so do I need to apply/register for the baccalaureate for next session, even though its just one course?