diff --git a/.circleci/config.yml b/.circleci/config.yml
index 903d0474..5bbb3409 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,13 +34,19 @@ jobs:
       - checkout
 
       - run:
-          name: Bootstrap make
+          name: coreboot gcc
           command: |
-            make bootstrap
+            /home/builder/heads/build/make-4.2.1/make \
+                V=1 \
+                TOOLCHAIN=/home/builder/heads \
+                packages=`pwd`/packages \
+                BOARD=qemu-coreboot \
+                coreboot-gcc \
+
       - run:
           name: qemu-coreboot
           command: |
-            ./build/make-4.2.1/make \
+            /home/builder/heads/build/make-4.2.1/make \
                 -j4 \
                 V=1 \
                 TOOLCHAIN=/home/builder/heads \
@@ -50,7 +56,7 @@ jobs:
       - run:
           name: qemu-linuxboot
           command: |
-            ./build/make-4.2.1/make \
+            /home/builder/heads/build/make-4.2.1/make \
                 -j4 \
                 V=1 \
                 TOOLCHAIN=/home/builder/heads \
diff --git a/modules/coreboot b/modules/coreboot
index d785abbc..1326e9d6 100644
--- a/modules/coreboot
+++ b/modules/coreboot
@@ -40,6 +40,7 @@ coreboot_output := coreboot.rom
 coreboot_depend += linux initrd
 
 # hack to force a build dependency on the cross compiler
+coreboot-gcc: $(build)/$(coreboot_base_dir)/util/crossgcc/xgcc/bin/i386-elf-gcc
 $(build)/$(coreboot_dir)/.configured: $(build)/$(coreboot_base_dir)/util/crossgcc/xgcc/bin/i386-elf-gcc
 $(build)/$(coreboot_base_dir)/util/crossgcc/xgcc/bin/i386-elf-gcc: $(build)/$(coreboot_base_dir)/.canary
 	echo '******* Building crossgcc-i386 (this might take a while) ******'