Assigned to SubDiv 17, the tender spent the next six months operating in Atlantic waters. She escorted her submarine charges to Norfolk, Virginia, New York, Newport, Rhode Island, and Portsmouth that fall, before ending the year at the submarine base in New London. Transferred to SubDiv 11, Beaver then convoyed that division to the West Indies in January 1923 for the annual "fleet problem", the fleet maneuvers that served as the culmination of the training year. In February–March, in company with and , the submarine tender supported operations in the Gulf of Panama as the submarines attempted to "defend the Canal Zone" in war games against the Battle Fleet. In April, the Commander, Submarine Division, Pacific, transferred his flag from "Camden" to "Beaver". The tender then joined SubDiv 16, consisting of six of the new S-boats, and escorted them back through the canal and on to San Pedro, arriving there at the end of the month.