diff --git a/spec/build/bsps/x86_64/amd64/abi.yml b/spec/build/bsps/x86_64/amd64/abi.yml
index 6e539bbd66..34ab13ffa1 100644
--- a/spec/build/bsps/x86_64/amd64/abi.yml
+++ b/spec/build/bsps/x86_64/amd64/abi.yml
@@ -7,6 +7,14 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH & Co. KG
 default:
+- enabled-by: x86_64/amd64efi
+  value:
+  - -fshort-wchar
+  - -maccumulate-outgoing-args
+  - -fno-stack-protector
+  - -fno-stack-check
+  - -mno-red-zone
+  - -mcmodel=large
 - enabled-by: true
   value:
   - -mno-red-zone
diff --git a/spec/build/bsps/x86_64/amd64/bspamd64.yml b/spec/build/bsps/x86_64/amd64/bspamd64.yml
index b07687b7a0..eefe8c4230 100644
--- a/spec/build/bsps/x86_64/amd64/bspamd64.yml
+++ b/spec/build/bsps/x86_64/amd64/bspamd64.yml
@@ -9,50 +9,13 @@ cppflags: []
 enabled-by: true
 family: amd64
 includes: []
-install:
-- destination: ${BSP_INCLUDEDIR}
-  source:
-  - bsps/x86_64/amd64/include/apic.h
-  - bsps/x86_64/amd64/include/bsp.h
-  - bsps/x86_64/amd64/include/clock.h
-  - bsps/x86_64/amd64/include/pic.h
-  - bsps/x86_64/amd64/include/start.h
-- destination: ${BSP_LIBDIR}
-  source:
-  - bsps/x86_64/amd64/start/linkcmds
+install: []
 links:
-- role: build-dependency
-  uid: ../../obj
-- role: build-dependency
-  uid: ../../objirq
-- role: build-dependency
-  uid: ../../objmem
 - role: build-dependency
   uid: ../../opto2
 - role: build-dependency
-  uid: abi
-- role: build-dependency
-  uid: start
-- role: build-dependency
-  uid: ../grp
-- role: build-dependency
-  uid: ../../bspopts
+  uid: grp
 source:
-- bsps/shared/cache/nocache.c
-- bsps/shared/dev/btimer/btimer-cpucounter.c
-- bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/serial/console-termios-init.c
-- bsps/shared/dev/serial/console-termios.c
-- bsps/shared/irq/irq-default-handler.c
-- bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/gettargethash-default.c
-- bsps/shared/start/sbrk.c
 - bsps/x86_64/amd64/clock/clock.c
 - bsps/x86_64/amd64/console/console.c
-- bsps/x86_64/amd64/interrupts/idt.c
-- bsps/x86_64/amd64/interrupts/isr_handler.S
-- bsps/x86_64/amd64/interrupts/pic.c
-- bsps/x86_64/amd64/start/bspstart.c
-- bsps/x86_64/amd64/start/bspreset.c
-- bsps/x86_64/amd64/start/page.c
 type: build
diff --git a/spec/build/bsps/x86_64/amd64/bspamd64efi.yml b/spec/build/bsps/x86_64/amd64/bspamd64efi.yml
index 9dfefc4b59..54b2727a45 100644
--- a/spec/build/bsps/x86_64/amd64/bspamd64efi.yml
+++ b/spec/build/bsps/x86_64/amd64/bspamd64efi.yml
@@ -11,32 +11,10 @@ family: amd64
 includes:
 - bsps/shared/freebsd/stand/efi/include
 - bsps/shared/freebsd/stand/efi/include/amd64
-install:
-- destination: ${BSP_INCLUDEDIR}
-  source:
-  - bsps/x86_64/amd64/include/apic.h
-  - bsps/x86_64/amd64/include/bsp.h
-  - bsps/x86_64/amd64/include/clock.h
-  - bsps/x86_64/amd64/include/pic.h
-  - bsps/x86_64/amd64/include/start.h
-- destination: ${BSP_LIBDIR}
-  source:
-  - bsps/x86_64/amd64/start/linkcmds
+install: []
 links:
-- role: build-dependency
-  uid: ../../obj
-- role: build-dependency
-  uid: ../../objirq
-- role: build-dependency
-  uid: ../../objmem
 - role: build-dependency
   uid: ../../opto2
-- role: build-dependency
-  uid: efiabi
-- role: build-dependency
-  uid: start
-- role: build-dependency
-  uid: ../grp
 - role: build-dependency
   uid: ../../optmultiboot
 - role: build-dependency
@@ -52,33 +30,18 @@ links:
 - role: build-dependency
   uid: ../../optefibs
 - role: build-dependency
-  uid: ../../bspopts
+  uid: ../../objefi
+- role: build-dependency
+  uid: grp
 - role: build-dependency
   uid: optldpagesize
-- role: build-dependency
-  uid: ../../objefi
 source:
-- bsps/shared/cache/nocache.c
-- bsps/shared/dev/btimer/btimer-cpucounter.c
-- bsps/shared/dev/getentropy/getentropy-cpucounter.c
-- bsps/shared/dev/serial/console-termios-init.c
-- bsps/shared/dev/serial/console-termios.c
-- bsps/shared/irq/irq-default-handler.c
-- bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/gettargethash-default.c
-- bsps/shared/start/sbrk.c
 - bsps/x86_64/amd64/clock/eficlock.c
 - bsps/x86_64/amd64/console/eficonsole.c
 - bsps/x86_64/amd64/console/efistop.c
 - bsps/x86_64/amd64/console/efigop.c
 - bsps/x86_64/amd64/console/outch.c
 - bsps/x86_64/amd64/console/console.c
-- bsps/x86_64/amd64/interrupts/idt.c
-- bsps/x86_64/amd64/interrupts/isr_handler.S
-- bsps/x86_64/amd64/interrupts/pic.c
-- bsps/x86_64/amd64/start/bspstart.c
-- bsps/x86_64/amd64/start/bspreset.c
 - bsps/x86_64/amd64/start/multiboot2.c
 - bsps/x86_64/amd64/start/efimem.c
-- bsps/x86_64/amd64/start/page.c
 type: build
diff --git a/spec/build/bsps/x86_64/amd64/efiabi.yml b/spec/build/bsps/x86_64/amd64/efiabi.yml
deleted file mode 100644
index 3781e43891..0000000000
--- a/spec/build/bsps/x86_64/amd64/efiabi.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-string: null
-- split: null
-- env-append: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH & Co. KG
-default:
-- enabled-by: true
-  value:
-  - -fshort-wchar
-  - -maccumulate-outgoing-args
-  - -fno-stack-protector
-  - -fno-stack-check
-  - -mno-red-zone
-  - -mcmodel=large
-description: |
-  ABI flags
-enabled-by: true
-links: []
-name: ABI_FLAGS
-type: build
diff --git a/spec/build/bsps/x86_64/amd64/grp.yml b/spec/build/bsps/x86_64/amd64/grp.yml
new file mode 100644
index 0000000000..c5f54b94f1
--- /dev/null
+++ b/spec/build/bsps/x86_64/amd64/grp.yml
@@ -0,0 +1,31 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: group
+cflags: []
+copyrights:
+- Copyright (C) 2024 Matheus Pecoraro
+cppflags: []
+cxxflags: []
+enabled-by: true
+includes: []
+install: []
+ldflags: []
+links:
+- role: build-dependency
+  uid: ../grp
+- role: build-dependency
+  uid: abi
+- role: build-dependency
+  uid: obj
+- role: build-dependency
+  uid: start
+- role: build-dependency
+  uid: ../../obj
+- role: build-dependency
+  uid: ../../objirq
+- role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
+  uid: ../../bspopts
+type: build
+use-after: []
+use-before: []
diff --git a/spec/build/bsps/x86_64/amd64/obj.yml b/spec/build/bsps/x86_64/amd64/obj.yml
new file mode 100644
index 0000000000..28c7cd42b2
--- /dev/null
+++ b/spec/build/bsps/x86_64/amd64/obj.yml
@@ -0,0 +1,38 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags: []
+copyrights:
+- Copyright (C) 2024 Matheus Pecoraro
+cppflags: []
+cxxflags: []
+enabled-by: true
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}
+  source:
+  - bsps/x86_64/amd64/include/apic.h
+  - bsps/x86_64/amd64/include/bsp.h
+  - bsps/x86_64/amd64/include/clock.h
+  - bsps/x86_64/amd64/include/pic.h
+  - bsps/x86_64/amd64/include/start.h
+- destination: ${BSP_LIBDIR}
+  source:
+  - bsps/i386/pc386/start/linkcmds
+links: []
+source:
+- bsps/shared/cache/nocache.c
+- bsps/shared/dev/btimer/btimer-cpucounter.c
+- bsps/shared/dev/getentropy/getentropy-cpucounter.c
+- bsps/shared/dev/serial/console-termios-init.c
+- bsps/shared/dev/serial/console-termios.c
+- bsps/shared/irq/irq-default-handler.c
+- bsps/shared/start/bspfatal-default.c
+- bsps/shared/start/gettargethash-default.c
+- bsps/shared/start/sbrk.c
+- bsps/x86_64/amd64/interrupts/idt.c
+- bsps/x86_64/amd64/interrupts/isr_handler.S
+- bsps/x86_64/amd64/interrupts/pic.c
+- bsps/x86_64/amd64/start/bspstart.c
+- bsps/x86_64/amd64/start/bspreset.c
+- bsps/x86_64/amd64/start/page.c
+type: build