diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f5d34bed..ae48b3fb5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -193,6 +193,7 @@ jobs:
             - build/x86/coreboot-4.14
             - build/x86/coreboot-4.15
             - build/x86/coreboot-4.17
+            - build/x86/coreboot-4.19
             - build/ppc64/coreboot-git
       - save_cache:
           #Generate cache for the exact same modules definitions if hash is not previously existing
@@ -250,6 +251,7 @@ workflows:
 #
 #
 
+#Coreboot 4.19 boards
       - build:
           name: x220-hotp-maximized
           target: x220-hotp-maximized
@@ -451,36 +453,37 @@ workflows:
           target: t440p-maximized
           subcommand: ""
           requires:
-            - librem_14
+            - x230-hotp-maximized 
 
       - build:
           name: t440p-hotp-maximized
           target: t440p-hotp-maximized
           subcommand: ""
           requires:
-            - librem_14
+            - x230-hotp-maximized
 
       - build:
-          name: qemu-coreboot
-          target: qemu-coreboot
+          name: qemu-coreboot-fbwhiptail-tpm2-hotp
+          target: qemu-coreboot-fbwhiptail-tpm2-hotp
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: qemu-coreboot-fbwhiptail
-          target: qemu-coreboot-fbwhiptail
+          name: p8z77-m_pro-tpm1-maximized
+          target: p8z77-m_pro-tpm1-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: qemu-coreboot-fbwhiptail-tpm2-hotp
-          target: qemu-coreboot-fbwhiptail-tpm2-hotp
+          name: p8z77-m_pro-tpm1-hotp-maximized
+          target: p8z77-m_pro-tpm1-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
+#Coreboot 4.17 boards
       - build:
           name: librem_13v2
           target: librem_13v2
@@ -523,20 +526,6 @@ workflows:
           requires:
             - librem_14
 
-      - build:
-          name: p8z77-m_pro-tpm1-maximized
-          target: p8z77-m_pro-tpm1-maximized
-          subcommand: ""
-          requires:
-            - librem_14
-
-      - build:
-          name: p8z77-m_pro-tpm1-hotp-maximized
-          target: p8z77-m_pro-tpm1-hotp-maximized
-          subcommand: ""
-          requires:
-            - librem_14
-
 #      - build:
 #          name: kgpe-d16_workstation-usb_keyboard
 #          target: kgpe-d16_workstation-usb_keyboard