diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea8117111..6bf503726 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,6 +28,17 @@ workflows:
   main:
     jobs:
       - soup-build-linux
+      - trigger-baseline-testplan
+  nightly:
+    triggers:
+      - schedule:
+          cron: "45 * * * *"
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - trigger-baseline-testplan
 
 jobs:
   soup-build-linux:
@@ -37,3 +48,16 @@ jobs:
       - run:
           name: "build lotus-soup"
           command: pushd lotus-soup && go build -tags=testground .
+  trigger-baseline-testplan:
+    executor: golang
+    steps:
+      - setup
+      - run:
+          name: "download testground"
+          command: wget https://gist.github.com/nonsense/5fbf3167cac79945f658771aed32fc44/raw/2e7ced2b1d0ca54033be57299e3fefb840958dfb/testground-3ee0dae -O ~/testground-cli && chmod +x ~/testground-cli
+      - run:
+          name: "prepare .env.toml"
+          command: pushd lotus-soup && mkdir -p $HOME/testground && cp env-ci.toml $HOME/testground/.env.toml && echo 'endpoint="'$endpoint'"' >> $HOME/testground/.env.toml && echo 'token="'$token'"' >> $HOME/testground/.env.toml
+      - run:
+          name: "trigger baseline test plan on testground ci"
+          command: mkdir -p $HOME/testground/plans && mv lotus-soup $HOME/testground/plans/ && ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/baseline-k8s-3-1.toml
diff --git a/Makefile b/Makefile
index fc748cfe2..28a6ae3ab 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,17 @@ download-proofs:
 	go run github.com/filecoin-project/go-paramfetch/paramfetch 2048 ./docker-images/proof-parameters.json
 
 build-images:
-	docker build -t "iptestground/oni-buildbase:v7" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
+	docker build -t "iptestground/oni-buildbase:v8" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
 	docker build -t "iptestground/oni-runtime:v3" -f "docker-images/Dockerfile.oni-runtime" "docker-images"
 	docker build -t "iptestground/oni-runtime:v4-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images"
 
 push-images:
-	docker push iptestground/oni-buildbase:v5
+	docker push iptestground/oni-buildbase:v8
 	docker push iptestground/oni-runtime:v3
 	docker push iptestground/oni-runtime:v4-debug
 
 pull-images:
-	docker pull iptestground/oni-buildbase:v5
+	docker pull iptestground/oni-buildbase:v8
 	docker pull iptestground/oni-runtime:v3
 	docker pull iptestground/oni-runtime:v4-debug
 
diff --git a/README.md b/README.md
index b9a1b7832..e64a2adbc 100644
--- a/README.md
+++ b/README.md
@@ -223,6 +223,7 @@ Additional to the Filecoin FFI Git submodules, we are also bundling `proof param
 * `v5` => locking in Filecoin FFI commit cddc56607e1d851ea6d09d49404bd7db70cb3c2e.
 * `v6` => locking in Filecoin FFI commit 40569104603407c999d6c9e4c3f1228cbd4d0e5c.
 * `v7` => add Filecoin-BLST repo to buildbase.
+* `v8` => locking in Filecoin FFI commit f640612a1a1f7a2d.
 
 
 ### oni-runtime
diff --git a/docker-images/Dockerfile.oni-buildbase b/docker-images/Dockerfile.oni-buildbase
index 5ff1b02dc..9ff9bc8d3 100644
--- a/docker-images/Dockerfile.oni-buildbase
+++ b/docker-images/Dockerfile.oni-buildbase
@@ -4,7 +4,7 @@ FROM golang:${GO_VERSION}-buster
 
 RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr
 
-ARG FILECOIN_FFI_COMMIT=40569104603407c999d6c9e4c3f1228cbd4d0e5c
+ARG FILECOIN_FFI_COMMIT=f640612a1a1f7a2d
 ARG FFI_DIR=/extra/filecoin-ffi
 
 RUN mkdir -p ${FFI_DIR} \
diff --git a/lotus-soup/env-ci.toml b/lotus-soup/env-ci.toml
new file mode 100644
index 000000000..bd651c465
--- /dev/null
+++ b/lotus-soup/env-ci.toml
@@ -0,0 +1 @@
+[client]
diff --git a/lotus-soup/manifest.toml b/lotus-soup/manifest.toml
index da6f61767..1a3c42fc0 100644
--- a/lotus-soup/manifest.toml
+++ b/lotus-soup/manifest.toml
@@ -10,7 +10,7 @@ enabled = true
 
 [builders."docker:go"]
 enabled = true
-build_base_image = "iptestground/oni-buildbase:v7"
+build_base_image = "iptestground/oni-buildbase:v8"
 runtime_image = "iptestground/oni-runtime:v4-debug"
 
 [runners."local:exec"]