The ATLAS experiment is planning a major upgrade of its tracking detectors during the Phase-II LHC shutdown, to better take advantage of the increased luminosity of the HL-LHC. The layout of the Pixel Tracker is undergoing an optimisation and will be finalised in 2017. The various layouts are presented. A description of the supporting structures, along with results from testing of prototypes are also discussed.