diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index b71b381..0000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-build_packages_task:
-  only_if: ${CIRRUS_TAG} == ''
-  timeout_in: 120m
-
-  compute_engine_instance:
-    platform: linux
-    cpu: 4
-    memory: 8G
-    image_project: cirrus-images
-    matrix:
-      - name: 'Linux x86_64'
-        image: family/docker-builder
-      - name: 'Linux aarch64'
-        image: family/docker-builder-arm64
-        architecture: arm64
-
-  clone_script: |
-    git clone -b "${CIRRUS_BRANCH}" https://github.com/adonis0147/devel-env
-    cd devel-env
-    git fetch --tags
-
-  prepare_script: |
-    cd devel-env
-
-    while read -r tag; do
-      url="https://github.com/adonis0147/devel-env/releases/download/${tag}/install_toolchain_$(uname -m).sh"
-      if curl --silent --head --fail -L "${url}" -o /dev/null; then
-        break
-      fi
-    done < <(git tag --sort=creatordate | tac)
-
-    echo "Download the toolchain from ${url}"
-    curl -L "${url}" -o devel/scripts/install_toolchain.sh
-    chmod a+x devel/scripts/install_toolchain.sh
-
-    devel/downloads/download_packages.sh
-
-    # Don't install llvm
-    sed -i '/function install_packages/,/^}/ s/llvm//' devel/scripts/install.sh
-
-    if [[ "$(uname -m)" != 'x86_64' ]]; then
-      # Don't install neovim
-      sed -i '/function install_packages/,/^}/ s/neovim//' devel/scripts/install.sh
-    fi
-
-    # Don't install zsh
-    sed -i '/function install_packages/,/^}/ s/zsh//' devel/scripts/install.sh
-
-  script: |
-    if [[ "$(uname -m)" == 'x86_64' ]]; then
-      cmd="sed -i -e 's|mirrorlist=|#mirrorlist=|' -e 's|#baseurl=http://mirror.centos.org/centos/\$releasever|baseurl=https://vault.centos.org/7.9.2009|' /etc/yum.repos.d/CentOS-Base.repo"
-    else
-      cmd="sed -i -e 's|mirrorlist=|#mirrorlist=|' -e 's|#baseurl=http://mirror.centos.org/altarch|baseurl=https://vault.centos.org/altarch|' /etc/yum.repos.d/CentOS-Base.repo"
-    fi
-
-    cat >>Dockerfile <<EOF
-    FROM centos:7
-    RUN ${cmd}
-    RUN yum install -y xz file make gettext texinfo
-
-    RUN mkdir /devel-env
-    WORKDIR /devel-env
-
-    CMD ["/bin/bash"]
-    EOF
-
-    docker build -t packages .
-    docker run --rm --mount=type=bind,source="$(pwd)/devel-env",target=/devel-env packages \
-      bash -c 'cd devel/scripts; bash install.sh'
diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 120000
index 0000000..bcb1f15
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1 @@
+.github/cirrus-ci/build_toolchain.yml
\ No newline at end of file
diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile
index 73b0347..c60ff3d 100644
--- a/toolchain/Dockerfile
+++ b/toolchain/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04 AS builder
 
 RUN apt update && apt upgrade --yes
 RUN DEBIAN_FRONTEND=noninteractive apt install --yes \
-    build-essential texinfo bison git curl rsync gawk python-is-python3 help2man file
+    build-essential texinfo bison flex git curl rsync gawk python-is-python3 help2man file
 
 RUN mkdir -p /opt/patchelf
 RUN curl -L "https://github.com/NixOS/patchelf/releases/download/0.16.1/patchelf-0.16.1-$(uname -m).tar.gz" \
diff --git a/toolchain/generate_toolchan.sh b/toolchain/generate_toolchan.sh
index ff7a1ef..b53d52c 100755
--- a/toolchain/generate_toolchan.sh
+++ b/toolchain/generate_toolchan.sh
@@ -267,6 +267,10 @@ function build_binutils_final() {
 	mkdir build
 	cd build
 
+	# Prevent binutils from linking libfl.so
+	export LEX='missing lex'
+	export FLEX='missing flex'
+
 	LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib \
         -Wl,-dynamic-linker,$(find "${PREFIX}/lib" -name 'ld-linux-*')" \
 		../configure --prefix="${PREFIX}" \
@@ -277,6 +281,9 @@ function build_binutils_final() {
 	make -j "$(nproc)"
 	make install-strip
 
+	unset FLEX
+	unset LEX
+
 	# Remove the old files
 	rm -rf "${PREFIX}/lib/ldscripts"