diff --git a/docker-images/Dockerfile.oni-buildbase b/docker-images/Dockerfile.oni-buildbase
index f9383b2d0..dae3b6dd3 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=5342c7c97d1a1df4650629d14f2823d52889edd9
+ARG FILECOIN_FFI_COMMIT=6a143e06f923f3a4f544c7a652e8b4df420a3d28
 ARG FFI_DIR=/extra/filecoin-ffi
 
 RUN mkdir -p ${FFI_DIR} \
diff --git a/docker-images/HISTORY.md b/docker-images/HISTORY.md
index 7560da9e9..a5fce90cd 100644
--- a/docker-images/HISTORY.md
+++ b/docker-images/HISTORY.md
@@ -5,6 +5,7 @@
 * `v1` => initial image locking in FFI commit ca281af0b6c00314382a75ae869e5cb22c83655b.
 * `v2` => no changes; released only for aligning both images to aesthetically please @nonsense :D
 * `v3` => locking in FFI commit 5342c7c97d1a1df4650629d14f2823d52889edd9.
+* `v4` => locking in FFI commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28.
 
 ## oni-runtime
 
diff --git a/docker-images/build.sh b/docker-images/build-buildbase.sh
similarity index 82%
rename from docker-images/build.sh
rename to docker-images/build-buildbase.sh
index c9c6946b0..1ad66b228 100755
--- a/docker-images/build.sh
+++ b/docker-images/build-buildbase.sh
@@ -24,4 +24,3 @@ fi
 dir="$(dirname "$0")"
 
 docker build -t "iptestground/oni-buildbase:$TAG" -f "$dir/Dockerfile.oni-buildbase" "$dir"
-docker build -t "iptestground/oni-runtime:$TAG" -f "$dir/Dockerfile.oni-runtime" "$dir"
diff --git a/docker-images/push.sh b/docker-images/build-runtime.sh
similarity index 52%
rename from docker-images/push.sh
rename to docker-images/build-runtime.sh
index ff2c4fcdc..8b0b2cc29 100755
--- a/docker-images/push.sh
+++ b/docker-images/build-runtime.sh
@@ -17,9 +17,10 @@ TAG=$1
 # Validate required arguments
 if [ -z "$TAG" ]
 then
-  echo -e "Please provide a tag for the push. For example: \`./push.sh v3\`"
+  echo -e "Please provide a tag for the build. For example: \`./build.sh v3\`"
   exit 2
 fi
 
-docker push "iptestground/oni-buildbase:$TAG"
-docker push "iptestground/oni-runtime:$TAG"
+dir="$(dirname "$0")"
+
+docker build -t "iptestground/oni-runtime:$TAG" -f "$dir/Dockerfile.oni-runtime" "$dir"