diff --git a/spec/build/bsps/aarch64/grp.yml b/spec/build/bsps/aarch64/grp.yml
index 8f40a9952e..613093f8bf 100644
--- a/spec/build/bsps/aarch64/grp.yml
+++ b/spec/build/bsps/aarch64/grp.yml
@@ -12,13 +12,6 @@ install:
   source:
   - bsps/aarch64/include/bsp/linker-symbols.h
   - bsps/aarch64/include/bsp/start.h
-- destination: ${BSP_INCLUDEDIR}/dev/irq
-  source:
-  - bsps/aarch64/include/dev/irq/arm-gic-arch.h
-  - bsps/include/dev/irq/arm-gic-irq.h
-  - bsps/include/dev/irq/arm-gic-regs.h
-  - bsps/include/dev/irq/arm-gic-tm27.h
-  - bsps/include/dev/irq/arm-gic.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/aarch64/shared/start/linkcmds.base
diff --git a/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml b/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml
index d48bb50440..db3579bad2 100644
--- a/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml
+++ b/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml
@@ -49,6 +49,8 @@ links:
   uid: ../../bspopts
 - role: build-dependency
   uid: linkercmds
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
@@ -66,7 +68,6 @@ source:
 - bsps/aarch64/raspberrypi/start/bspstartmmu.c
 - bsps/aarch64/shared/cache/cache.c
 - bsps/aarch64/shared/mmu/vmsav8-64.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
 - bsps/shared/dev/serial/console-termios-init.c
 - bsps/shared/dev/serial/console-termios.c
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
index dc2d31b87b..cc34311541 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
@@ -40,6 +40,8 @@ links:
   uid: optclkuart
 - role: build-dependency
   uid: ../objclockarmgenerictimer
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml
index 1823db4550..ea6c4e3eba 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml
@@ -30,7 +30,6 @@ source:
 - bsps/aarch64/xilinx-zynqmp/start/bspstartmmu.c
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-zynqmp.c
 - bsps/shared/dev/serial/console-termios-init.c
 - bsps/shared/dev/serial/console-termios.c
diff --git a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
index d570b713ac..1b2a4b4eec 100644
--- a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
+++ b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
@@ -95,6 +95,8 @@ links:
   uid: ../grp
 - role: build-dependency
   uid: ../start
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
@@ -129,7 +131,6 @@ source:
 - bsps/arm/shared/start/bsp-start-memcpy.S
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
 - bsps/shared/dev/rtc/rtc-support.c
 - bsps/shared/dev/serial/console-termios-init.c
diff --git a/spec/build/bsps/arm/grp.yml b/spec/build/bsps/arm/grp.yml
index 1086e0f7ab..863a4df409 100644
--- a/spec/build/bsps/arm/grp.yml
+++ b/spec/build/bsps/arm/grp.yml
@@ -39,13 +39,6 @@ install:
   - bsps/arm/include/bsp/lpc-lcd.h
   - bsps/arm/include/bsp/lpc-timer.h
   - bsps/arm/include/bsp/start.h
-- destination: ${BSP_INCLUDEDIR}/dev/irq
-  source:
-  - bsps/arm/include/dev/irq/arm-gic-arch.h
-  - bsps/include/dev/irq/arm-gic-irq.h
-  - bsps/include/dev/irq/arm-gic-regs.h
-  - bsps/include/dev/irq/arm-gic-tm27.h
-  - bsps/include/dev/irq/arm-gic.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/arm/shared/start/linkcmds.armv4
diff --git a/spec/build/bsps/arm/imx/bspimx.yml b/spec/build/bsps/arm/imx/bspimx.yml
index 9a71e5f389..2d0344184f 100644
--- a/spec/build/bsps/arm/imx/bspimx.yml
+++ b/spec/build/bsps/arm/imx/bspimx.yml
@@ -72,6 +72,8 @@ links:
   uid: optresetvec
 - role: build-dependency
   uid: ../start
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
@@ -101,7 +103,6 @@ source:
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/clock/arm-generic-timer.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
 - bsps/shared/dev/rtc/rtc-support.c
 - bsps/shared/dev/serial/console-termios.c
diff --git a/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml b/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml
index f8d30d308a..789d71c35a 100644
--- a/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml
+++ b/spec/build/bsps/arm/realview-pbx-a9/bsprealviewpbxa9.yml
@@ -45,6 +45,8 @@ links:
   uid: ../start
 - role: build-dependency
   uid: ../../linkcmds
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
@@ -74,7 +76,6 @@ source:
 - bsps/arm/shared/start/bsp-start-memcpy.S
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
 - bsps/shared/dev/serial/console-termios-init.c
 - bsps/shared/dev/serial/console-termios.c
diff --git a/spec/build/bsps/arm/xen/bspxen.yml b/spec/build/bsps/arm/xen/bspxen.yml
index 2634fd57ea..517147d3ee 100644
--- a/spec/build/bsps/arm/xen/bspxen.yml
+++ b/spec/build/bsps/arm/xen/bspxen.yml
@@ -42,6 +42,8 @@ links:
   uid: optramori
 - role: build-dependency
   uid: optzimghdr
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
@@ -73,7 +75,6 @@ source:
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/clock/arm-generic-timer.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
 - bsps/shared/dev/serial/console-termios-init.c
 - bsps/shared/dev/serial/console-termios.c
diff --git a/spec/build/bsps/arm/xilinx-zynq/grp.yml b/spec/build/bsps/arm/xilinx-zynq/grp.yml
index 529fdb320f..8b5e53b5e3 100644
--- a/spec/build/bsps/arm/xilinx-zynq/grp.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/grp.yml
@@ -52,6 +52,8 @@ links:
   uid: optramori
 - role: build-dependency
   uid: optresetvec
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xilinx-zynq/obj.yml b/spec/build/bsps/arm/xilinx-zynq/obj.yml
index b30fbfa94d..525678a14b 100644
--- a/spec/build/bsps/arm/xilinx-zynq/obj.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/obj.yml
@@ -34,7 +34,6 @@ source:
 - bsps/arm/xilinx-zynq/start/bspstartmmu.c
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-get-attributes.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
diff --git a/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml b/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml
index a088c69052..d473a1be71 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml
@@ -48,6 +48,8 @@ links:
   uid: optnocachelen
 - role: build-dependency
   uid: obj
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xilinx-zynqmp-rpu/obj.yml b/spec/build/bsps/arm/xilinx-zynqmp-rpu/obj.yml
index 3bb83019dc..b7957bc8a6 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp-rpu/obj.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp-rpu/obj.yml
@@ -31,7 +31,6 @@ source:
 - bsps/shared/dev/clock/xil-ttc.c
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-zynqmp.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
index 0d0c7ef1e7..fe0b9b451f 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
@@ -60,6 +60,8 @@ links:
   uid: optramori
 - role: build-dependency
   uid: optresetvec
+- role: build-dependency
+  uid: ../../dev/irq/objarmgicv2
 - role: build-dependency
   uid: ../../obj
 - role: build-dependency
@@ -94,7 +96,6 @@ source:
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/clock/arm-generic-timer.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/irq/arm-gicv2.c
 - bsps/shared/dev/irq/arm-gicv2-zynqmp.c
 - bsps/shared/dev/serial/console-termios.c
 - bsps/shared/irq/irq-default-handler.c
diff --git a/spec/build/bsps/dev/irq/grpaarch64gic.yml b/spec/build/bsps/dev/irq/grpaarch64gic.yml
new file mode 100644
index 0000000000..ffee5d360b
--- /dev/null
+++ b/spec/build/bsps/dev/irq/grpaarch64gic.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+cflags: []
+copyrights:
+- Copyright (C) 2024 embedded brains GmbH & Co. KG
+cppflags: []
+cxxflags: []
+enabled-by: aarch64
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}/dev/irq
+  source:
+  - bsps/aarch64/include/dev/irq/arm-gic-arch.h
+ldflags: []
+links: []
+type: build
+use-after: []
+use-before: []
diff --git a/spec/build/bsps/dev/irq/grparmgic.yml b/spec/build/bsps/dev/irq/grparmgic.yml
new file mode 100644
index 0000000000..0a536ddaf5
--- /dev/null
+++ b/spec/build/bsps/dev/irq/grparmgic.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+cflags: []
+copyrights:
+- Copyright (C) 2024 embedded brains GmbH & Co. KG
+cppflags: []
+cxxflags: []
+enabled-by: arm
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}/dev/irq
+  source:
+  - bsps/arm/include/dev/irq/arm-gic-arch.h
+ldflags: []
+links: []
+type: build
+use-after: []
+use-before: []
diff --git a/spec/build/bsps/dev/irq/objarmgicv2.yml b/spec/build/bsps/dev/irq/objarmgicv2.yml
new file mode 100644
index 0000000000..d63626c919
--- /dev/null
+++ b/spec/build/bsps/dev/irq/objarmgicv2.yml
@@ -0,0 +1,24 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags: []
+copyrights:
+- Copyright (C) 2024 embedded brains GmbH & Co. KG
+cppflags: []
+cxxflags: []
+enabled-by: true
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}/dev/irq
+  source:
+  - bsps/include/dev/irq/arm-gic.h
+  - bsps/include/dev/irq/arm-gic-irq.h
+  - bsps/include/dev/irq/arm-gic-regs.h
+  - bsps/include/dev/irq/arm-gic-tm27.h
+links:
+- role: build-dependency
+  uid: grpaarch64gic
+- role: build-dependency
+  uid: grparmgic
+source:
+- bsps/shared/dev/irq/arm-gicv2.c
+type: build
diff --git a/spec/build/bsps/dev/irq/objarmgicv3.yml b/spec/build/bsps/dev/irq/objarmgicv3.yml
index 382d767dd7..3ef283407f 100644
--- a/spec/build/bsps/dev/irq/objarmgicv3.yml
+++ b/spec/build/bsps/dev/irq/objarmgicv3.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: objects
 cflags: []
 copyrights:
-- Copyright (C) 2022 embedded brains GmbH & Co. KG
+- Copyright (C) 2022, 2024 embedded brains GmbH & Co. KG
 cppflags: []
 cxxflags: []
 enabled-by: true
@@ -10,6 +10,10 @@ includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}/dev/irq
   source:
+  - bsps/include/dev/irq/arm-gic.h
+  - bsps/include/dev/irq/arm-gic-irq.h
+  - bsps/include/dev/irq/arm-gic-regs.h
+  - bsps/include/dev/irq/arm-gic-tm27.h
   - bsps/include/dev/irq/arm-gicv3.h
 links:
 - role: build-dependency
@@ -26,6 +30,10 @@ links:
   uid: optarmgic-icc-pmr
 - role: build-dependency
   uid: optarmgic-icc-sre
+- role: build-dependency
+  uid: grpaarch64gic
+- role: build-dependency
+  uid: grparmgic
 source:
 - bsps/shared/dev/irq/arm-gicv3.c
 type: build