Yes that looks right. I would use blue loctite.