diff --git a/thermosphere/src/platform/qemu/interrupt_config.h b/thermosphere/src/platform/qemu/interrupt_config.h
index f1b5de3aa..92ab936e5 100644
--- a/thermosphere/src/platform/qemu/interrupt_config.h
+++ b/thermosphere/src/platform/qemu/interrupt_config.h
@@ -21,7 +21,14 @@
 // For both guest and host
 #define MAX_NUM_REGISTERED_INTERRUPTS 512
 
-#define GIC_IRQID_MAINTENANCE  25
+#define GIC_IRQID_PMU               23
+#define GIC_IRQID_MAINTENANCE       25
+#define GIC_IRQID_HYP_TIMER         26
+#define GIC_IRQID_VIRT_TIMER        27
+//#define GIC_IRQID_LEGACY_NFIQ       28 not defined?
+#define GIC_IRQID_SEC_PHYS_TIMER    29
+#define GIC_IRQID_NS_PHYS_TIMER     30
+//#define GIC_IRQID_LEGACY_NIRQ       31 not defined?
 
 static inline void initGicV2Pointers(ArmGicV2 *gic)
 {
@@ -29,4 +36,4 @@ static inline void initGicV2Pointers(ArmGicV2 *gic)
     gic->gicc = (volatile ArmGicV2Controller *)0x08010000ull;
     gic->gich = (volatile ArmGicV2VirtualInterfaceController *)0x08030000ull;
     gic->gicv = (volatile ArmGicV2Controller *)0x08040000ull;
-}
\ No newline at end of file
+}
diff --git a/thermosphere/src/platform/tegra/interrupt_config.h b/thermosphere/src/platform/tegra/interrupt_config.h
index 8fcc7c310..562b88abb 100644
--- a/thermosphere/src/platform/tegra/interrupt_config.h
+++ b/thermosphere/src/platform/tegra/interrupt_config.h
@@ -21,7 +21,14 @@
 // For both guest and host
 #define MAX_NUM_REGISTERED_INTERRUPTS 512
 
-#define GIC_IRQID_MAINTENANCE  25
+#define GIC_IRQID_MAINTENANCE       25
+#define GIC_IRQID_HYP_TIMER         26
+#define GIC_IRQID_VIRT_TIMER        27
+#define GIC_IRQID_LEGACY_NFIQ       28
+#define GIC_IRQID_SEC_PHYS_TIMER    29
+#define GIC_IRQID_NS_PHYS_TIMER     30
+#define GIC_IRQID_LEGACY_NIRQ       31
+
 
 static inline void initGicV2Pointers(ArmGicV2 *gic)
 {
@@ -29,4 +36,4 @@ static inline void initGicV2Pointers(ArmGicV2 *gic)
     gic->gicc = (volatile ArmGicV2Controller *)0x50042000ull;
     gic->gich = (volatile ArmGicV2VirtualInterfaceController *)0x50044000ull;
     gic->gicv = (volatile ArmGicV2Controller *)0x50046000ull;
-}
\ No newline at end of file
+}