A gas turbine engine includes an engine static structure housing that includes a compressor section and a turbine section. A combustor section is arranged axially between the compressor section and the turbine section. A core nacelle encloses the engine static structure to provide a core compartment. An oil tank is arranged in the core compartment and is axially aligned with the compressor section. A heat exchanger is secured to the oil tank and arranged in the core compartment.