diff --git a/.github/ci/build_himbaechel.sh b/.github/ci/build_himbaechel.sh
index 73db3b57..62e13390 100644
--- a/.github/ci/build_himbaechel.sh
+++ b/.github/ci/build_himbaechel.sh
@@ -7,13 +7,8 @@ function get_dependencies {
 function build_nextpnr {
     mkdir build
     pushd build
-    cmake .. -DARCH=himbaechel
-    make nextpnr-himbaechel bbasm -j`nproc`
-    # We'd ideally use pypy3 for speed (as works locally), but the version
-    # our CI Ubuntu provides doesn't like some of the typing stuff
-    python3 ../himbaechel/uarch/example/example_arch_gen.py ./example.bba
-    mkdir -p share/himbaechel/example
-    ./bba/bbasm --l ./example.bba share/himbaechel/example/example.bin
+    cmake .. -DARCH=himbaechel -DHIMBAECHEL_EXAMPLE_DEVICES=example
+    make nextpnr-himbaechel chipdb-himbaechel-example -j`nproc`
     popd
 }