Might be worth investing in some BPA free bottles especially for long term storage of ejuices. Nicotine is strong and I have concerns about it possible eroding plastic containers during long term storage, especially if your stock piling for the next two years. I've just invested in some 15ml glass bottles with glass eyedroppers.