The present building, or “Great Church of Jvari”, was built between 586 and 605 by Erismtavari Stepanoz I. The importance of Jvari complex increased over time and attracted many pilgrims. In the late Middle Ages, the complex was fortified by a stone wall and gate, remnants of which still survive. During the Soviet period, the structure was largely ignored, with access rendered difficult by tight security at a nearby military base. After the independence of Georgia, the building was restored to active religious use. Jvari was listed together with other monuments of Mtskheta in 1996 as a UNESCO World Heritage Site.