diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
index 31b628150272..ec34491431f5 100644
--- a/.github/workflows/bsd.yml
+++ b/.github/workflows/bsd.yml
@@ -23,11 +23,13 @@ jobs:
       uses: vmactions/freebsd-vm@v1
       with:
         usesh: true
+        sync: rsync
+        copyback: false
         prepare: |
           pkg install -y \
             bash \
             wget \
-            python38 \
+            python310 \
             gmake \
             git \
             python \
@@ -39,38 +41,26 @@ jobs:
             gettext \
             sqlite3 \
             lowdown \
+            pkgconf \
+            jq \
+            protobuf \
             curl
 
-            python3.8 -m ensurepip
-            python3.8 -m pip install --upgrade pip
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-11-28
+            python3.10 -m ensurepip
+            python3.10 -m pip install --upgrade pip
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
 
-            cd /tmp/ || exit 1
-            wget https://bitcoincore.org/bin/bitcoin-core-${{ matrix.bitcoind-version }}/bitcoin-${{ matrix.bitcoind-version }}-x86_64-linux-gnu.tar.gz
-            tar -xf bitcoin-${{ matrix.bitcoind-version }}-x86_64-linux-gnu.tar.bz2
-            sudo mv bitcoin-${{ matrix.bitcoind-version }}/bin/* /usr/local/bin
-            rm -rf bitcoin-${{ matrix.bitcoind-version }}-x86_64-linux-gnu.tar.gz bitcoin-${{ matrix.bitcoind-version }}
 
         run: |
-          PATH=/root/.local/bin:$PATH
+          PATH=/root/.local/bin:$PATH:/root/.cargo/bin; export PATH
           pip install --user -U wheel pip
-          pip install --user -U -r requirements.txt
-
-          # Install utilities that aren't dependencies, but make
-          # running tests easier/feasible on CI (and pytest which
-          # keeps breaking the rerunfailures plugin).
-          pip install --user -U \
-            blinker \
-            flake8 \
-            mako \
-            pytest-sentry \
-            pytest-test-groups==1.0.3 \
-            pytest-custom-exit-code==0.3.0 \
-            pytest-json-report
+          pip3 install --user poetry
+          poetry install
 
           git clone https://github.com/lightning/bolts.git ../bolts
           # fatal: unsafe repository ('/Users/runner/work/lightning/lightning' is owned by someone else)
           git config --global --add safe.directory `pwd`
+          for d in libsodium libwally-core gheap jsmn libbacktrace lowdown; do git config --global --add safe.directory `pwd`/external/$d; done
           git submodule update --init --recursive
 
           ./configure CC="$CC" --disable-valgrind
@@ -85,7 +75,5 @@ jobs:
           EOF
 
           # Just run a "quick" test without memory checking
-          gmake
+          poetry run gmake
 
-          # Clean up to maximize rsync's chances of succeeding
-          gmake clean