To this day, the standard method for investigating biological tissue with cellular resolution is the examination under a light microscope, first denoted as histology by Karl Meyer in 1819. Despite the enormous success and importance of histology, it has two major disadvantages. Firstly, the specimen must be physically cut into thin sections due to the limited penetrating power of optical light, and secondly, additional staining of the specimen is required to achieve sufficient image contrast. Both disadvantages can be overcome by the non-destructive method of propagation-based X-ray phase-contrast tomography. While the mechanism of phase-contrast provides sufficient image contrast to image single cells, a tomographic imaging scheme with penetrating X-rays allows for an undamaged sample by virtually slicing the reconstructed 3D sample volume. In this work, the holotomography setup of the synchrotron endstation „GINIX“ (The Göttingen Instrument for Nanoscale-Imaging with X-Rays) was extended to a multi-scale X-ray phase-contrast tomography setup suitable for 3D virtual histology by adding two acquisition schemes. Compared to the existing setup, the first additional scheme is a propagation-based microtomography setup, which enlarges the reconstructed 3D volumes by a factor of approx. 64 at a fraction of the acquisition time (ca. 2 min). The second additional scheme aims for higher resolutions. To this end, the X-ray waveguide illumination was combined with photon counting detector with a large field of view and a novel phase reconstruction scheme, which is based on iterative farfield phase retrieval without an „empty-beam correction“ in the detector plane.