diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4868493bea..15470622fa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -189,6 +189,7 @@ jobs:
             - build/x86/coreboot-4.14
             - build/x86/coreboot-4.15
             - build/x86/coreboot-4.17
+            - build/x86/coreboot-git
             - build/ppc64/coreboot-git
       - save_cache:
           #Generate cache for the exact same modules definitions if hash is not previously existing
@@ -209,27 +210,10 @@ workflows:
 # version. The last board in the sequence is the dependency
 # for the parallel boards built at the end, and also save_cache.
 
-      # Coreboot 4.13
+      # Coreboot x86
       - build_and_persist:
-          name: x230-hotp-maximized
-          target: x230-hotp-maximized
-          subcommand: ""
-          requires:
-            - prep_env
-
-      # Coreboot 4.15
-      - build_and_persist:
-          name: librem_14
-          target: librem_14
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      # Coreboot for Talos (PPC)
-      - build_and_persist:
-          name: talos-2_server
-          arch: ppc64
-          target: talos-2_server
+          name: kgpe-d16_server-whiptail
+          target: kgpe-d16_server-whiptail
           subcommand: ""
           requires:
             - prep_env
@@ -238,288 +222,7 @@ workflows:
       #Below, 4.11, 4.13, 4.17
       - save_cache:
           requires:
-            - librem_14
-            - talos-2_server
-
-#
-#
-# Those onboarding new boards should add their entries below.
-#
-#
-
-      - build:
-          name: x220-hotp-maximized
-          target: x220-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x220-maximized
-          target: x220-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t420-hotp-maximized
-          target: t420-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t520-hotp-maximized
-          target: t520-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t420-maximized
-          target: t420-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t520-maximized
-          target: t520-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-flash
-          target: x230-flash
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t430-flash
-          target: t430-flash
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t430
-          target: t430
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t430-hotp-verification
-          target: t430-hotp-verification
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230
-          target: x230
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-hotp-verification
-          target: x230-hotp-verification
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-hotp-maximized_usb-kb
-          target: x230-hotp-maximized_usb-kb
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t430-hotp-maximized
-          target: t430-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-maximized
-          target: x230-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t530-hotp-maximized
-          target: t530-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t530-dgpu-hotp-maximized
-          target: t530-dgpu-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: w530-hotp-maximized
-          target: w530-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: w530-dgpu-K1000m-hotp-maximized
-          target: w530-dgpu-K1000m-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized  
-
-      - build:
-          name: w530-dgpu-K2000m-hotp-maximized
-          target: w530-dgpu-K2000m-hotp-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized  
-            
-      - build:
-          name: t430-maximized
-          target: t430-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t530-maximized
-          target: t530-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: t530-dgpu-maximized
-          target: t530-dgpu-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: w530-maximized
-          target: w530-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: w530-dgpu-K1000m-maximized
-          target: w530-dgpu-K1000m-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: w530-dgpu-K2000m-maximized
-          target: w530-dgpu-K2000m-maximized
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: qemu-coreboot
-          target: qemu-coreboot
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: qemu-coreboot-fbwhiptail
-          target: qemu-coreboot-fbwhiptail
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: librem_13v2
-          target: librem_13v2
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: librem_15v3
-          target: librem_15v3
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: librem_13v4
-          target: librem_13v4
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: librem_15v4
-          target: librem_15v4
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: librem_mini
-          target: librem_mini
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: librem_mini_v2
-          target: librem_mini_v2
-          subcommand: ""
-          requires:
-            - librem_14
-
-#      - build:
-#          name: kgpe-d16_workstation-usb_keyboard
-#          target: kgpe-d16_workstation-usb_keyboard
-#          subcommand: ""
-#          requires:
-#            - kgpe-d16_workstation
-
-#      - build:
-#          name: kgpe-d16_server
-#          target: kgpe-d16_server
-#          subcommand: ""
-#          requires:
-#            - kgpe-d16_workstation
-
-#      - build:
-#          name: kgpe-d16_server-whiptail
-#          target: kgpe-d16_server-whiptail
-#          subcommand: ""
-#          requires:
-#            - kgpe-d16_workstation
-
-#      - build:
-#          name: librem_l1um
-#          target: librem_l1um
-#          subcommand: ""
-#          requires:
-#            - librem_14
-
-      - build:
-          name: talos-2_workstation
-          arch: ppc64
-          target: talos-2_workstation
-          subcommand: ""
-          requires:
-            - talos-2_server
+            - kgpe-d16_server-whiptail
 
 ########################
 ########################
diff --git a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
index 045ccf01e5..dbdaba9df9 100644
--- a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
+++ b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
@@ -18,7 +18,7 @@
 #   sure their operating system loads microcode updates.
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config
index 26a261ec98..2a00130168 100644
--- a/boards/kgpe-d16_server/kgpe-d16_server.config
+++ b/boards/kgpe-d16_server/kgpe-d16_server.config
@@ -16,7 +16,7 @@
 # - Please contribute documentation on heads-wiki
 # - Please support https://github.com/osresearch/heads/issues/719
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
index 78b56ff423..0893b07fb9 100644
--- a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
+++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
@@ -12,7 +12,7 @@
 #   sure their operating system loads microcode updates.
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
index 6cee65ca1c..884039f497 100644
--- a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
+++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
@@ -16,7 +16,7 @@
 
 
 export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.11
+export CONFIG_COREBOOT_VERSION=dasharo_kgpe-d16
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
diff --git a/config/coreboot-kgpe-d16_server-whiptail.config b/config/coreboot-kgpe-d16_server-whiptail.config
index d8be2b93f8..9c86747fbf 100644
--- a/config/coreboot-kgpe-d16_server-whiptail.config
+++ b/config/coreboot-kgpe-d16_server-whiptail.config
@@ -1,18 +1,30 @@
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_COLLECT_TIMESTAMPS is not set
+CONFIG_CBMEM_STAGE_CACHE=y
 CONFIG_VENDOR_ASUS=y
-CONFIG_UART_FOR_CONSOLE=1
+CONFIG_CBFS_SIZE=0x01000000
 CONFIG_BOARD_ASUS_KGPE_D16=y
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_CONSOLE_POST=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
-# CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_MEASURED_BOOT=y
-CONFIG_USER_TPM1=y
+CONFIG_PCIEXP_HOTPLUG_IO=0x1000
+CONFIG_NO_GFX_INIT=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
+CONFIG_TPM1=y
 CONFIG_TPM_RDRESP_NEED_DELAY=y
+CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_POST_DEVICE_LPC=y
+CONFIG_POST_IO_PORT=0x80
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
-CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
-CONFIG_CPU_MICROCODE_CBFS_NONE=y
diff --git a/modules/coreboot b/modules/coreboot
index 860228dac4..95c84b9c89 100644
--- a/modules/coreboot
+++ b/modules/coreboot
@@ -39,7 +39,10 @@ else ifeq "$(CONFIG_COREBOOT_VERSION)" "talos_2"
 	coreboot_version = git
 	coreboot_commit_hash = 2207bbcccba31ad89cf21607b0d8d05d8dc47c03
 	coreboot_repo := https://github.com/Dasharo/coreboot
-
+else ifeq "$(CONFIG_COREBOOT_VERSION)" "dasharo_kgpe-d16"
+        coreboot_version = git
+        coreboot_commit_hash = 6edf2d06df3d5c28f1ddfb1705e076a0694df5a5
+        coreboot_repo := https://github.com/Dasharo/coreboot
 else
 	$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")
 endif