diff --git a/boards/arm64/xenvm/xenvm_defconfig b/boards/arm64/xenvm/xenvm_defconfig
index 8905b74a0c..ff8597199e 100644
--- a/boards/arm64/xenvm/xenvm_defconfig
+++ b/boards/arm64/xenvm/xenvm_defconfig
@@ -4,7 +4,7 @@ CONFIG_BOARD_XENVM=y
 # Enable UART driver
 CONFIG_SERIAL=y
 
-CONFIG_MAX_XLAT_TABLES=10
+CONFIG_MAX_XLAT_TABLES=24
 CONFIG_HEAP_MEM_POOL_SIZE=16384
 
 # Enable console
diff --git a/boards/arm64/xenvm/xenvm_gicv3_defconfig b/boards/arm64/xenvm/xenvm_gicv3_defconfig
index 9bff11a2ed..59a0c306cb 100644
--- a/boards/arm64/xenvm/xenvm_gicv3_defconfig
+++ b/boards/arm64/xenvm/xenvm_gicv3_defconfig
@@ -4,7 +4,7 @@ CONFIG_BOARD_XENVM=y
 # Enable UART driver
 CONFIG_SERIAL=y
 
-CONFIG_MAX_XLAT_TABLES=10
+CONFIG_MAX_XLAT_TABLES=24
 
 # Enable console
 CONFIG_CONSOLE=y
diff --git a/drivers/xen/gnttab.c b/drivers/xen/gnttab.c
index d871eb62d2..8ceb97e2db 100644
--- a/drivers/xen/gnttab.c
+++ b/drivers/xen/gnttab.c
@@ -28,17 +28,24 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/sys/device_mmio.h>
 
 LOG_MODULE_REGISTER(xen_gnttab);
 
 /* Timeout for grant table ops retrying */
 #define GOP_RETRY_DELAY 200
 
+#define GNTTAB_SIZE DT_REG_SIZE_BY_IDX(DT_INST(0, xen_xen), 0)
+BUILD_ASSERT(!(GNTTAB_SIZE % XEN_PAGE_SIZE), "Size of gnttab have to be aligned on XEN_PAGE_SIZE");
+
 /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
-#define NR_GRANT_FRAMES			1
+#define NR_GRANT_FRAMES (GNTTAB_SIZE / XEN_PAGE_SIZE)
 #define NR_GRANT_ENTRIES \
 	(NR_GRANT_FRAMES * XEN_PAGE_SIZE / sizeof(grant_entry_v1_t))
 
+BUILD_ASSERT(GNTTAB_SIZE <= CONFIG_KERNEL_VM_SIZE);
+DEVICE_MMIO_TOPLEVEL_STATIC(grant_tables, DT_INST(0, xen_xen));
+
 static struct gnttab {
 	struct k_sem sem;
 	grant_entry_v1_t *table;
@@ -307,15 +314,12 @@ static int gnttab_init(void)
 		put_free_entry(gref);
 	}
 
-	gnttab.table = (grant_entry_v1_t *)
-			DT_REG_ADDR_BY_IDX(DT_INST(0, xen_xen), 0);
-
 	for (i = 0; i < NR_GRANT_FRAMES; i++) {
 		xatp.domid = DOMID_SELF;
 		xatp.size = 0;
 		xatp.space = XENMAPSPACE_grant_table;
 		xatp.idx = i;
-		xatp.gpfn = xen_virt_to_gfn(gnttab.table) + i;
+		xatp.gpfn = xen_virt_to_gfn(Z_TOPLEVEL_ROM_NAME(grant_tables).phys_addr) + i;
 		rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
 		__ASSERT(!rc, "add_to_physmap failed; status = %d\n", rc);
 	}
@@ -327,6 +331,9 @@ static int gnttab_init(void)
 	__ASSERT((!rc) && (!setup.status), "Table setup failed; status = %s\n",
 		gnttabop_error(setup.status));
 
+	DEVICE_MMIO_TOPLEVEL_MAP(grant_tables, K_MEM_CACHE_WB | K_MEM_PERM_RW);
+	gnttab.table = (grant_entry_v1_t *)DEVICE_MMIO_TOPLEVEL_GET(grant_tables);
+
 	LOG_DBG("%s: grant table mapped\n", __func__);
 
 	return 0;
diff --git a/soc/arm64/xenvm/Kconfig.defconfig b/soc/arm64/xenvm/Kconfig.defconfig
index 9d8d6847e2..4a88b6bed9 100644
--- a/soc/arm64/xenvm/Kconfig.defconfig
+++ b/soc/arm64/xenvm/Kconfig.defconfig
@@ -14,4 +14,9 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int
 	default 8320000
 
+# We need at least 16M of virtual address space to map memory of Xen node
+# 32M should be enough for basic use-cases
+config KERNEL_VM_SIZE
+	default 0x2000000
+
 endif
diff --git a/soc/arm64/xenvm/mmu_regions.c b/soc/arm64/xenvm/mmu_regions.c
index 43e3ada82e..070bb01474 100644
--- a/soc/arm64/xenvm/mmu_regions.c
+++ b/soc/arm64/xenvm/mmu_regions.c
@@ -18,11 +18,6 @@ static const struct arm_mmu_region mmu_regions[] = {
 			      DT_REG_ADDR_BY_IDX(DT_INST(0, arm_gic), 1),
 			      DT_REG_SIZE_BY_IDX(DT_INST(0, arm_gic), 1),
 			      MT_DEVICE_nGnRnE | MT_P_RW_U_NA | MT_NS),
-
-	MMU_REGION_FLAT_ENTRY("HYPERVISOR",
-			      DT_REG_ADDR_BY_IDX(DT_INST(0, xen_xen), 0),
-			      DT_REG_SIZE_BY_IDX(DT_INST(0, xen_xen), 0),
-			      MT_NORMAL | MT_P_RW_U_NA | MT_NS),
 };
 
 const struct arm_mmu_config mmu_config = {