diff --git a/ci/release/build.sh b/ci/release/build.sh
index 242ebd6de..135160f82 100755
--- a/ci/release/build.sh
+++ b/ci/release/build.sh
@@ -5,7 +5,7 @@ cd -- "$(dirname "$0")/../.."
 
 help() {
   cat <<EOF
-usage: $0 [--rebuild] [--local] [--dry-run] [--run=regex] [--host-only]
+usage: $0 [--rebuild] [--local] [--dry-run] [--run=regex] [--host-only] [--lockfile-force]
 
 $0 builds D2 release archives into ./ci/release/build/<version>/d2-<VERSION>-<OS>-<ARCH>.tar.gz
 
@@ -35,6 +35,9 @@ Flags:
 
 --version vX.X.X
   Use to overwrite the version detected from git.
+
+--lockfile-force
+  Forcefully take ownership of remote builder lockfiles.
 EOF
 }
 
@@ -71,6 +74,10 @@ main() {
         flag_nonemptyarg && shift "$FLAGSHIFT"
         VERSION=$FLAGARG
         ;;
+      lockfile-force)
+        flag_noarg && shift "$FLAGSHIFT"
+        LOCKFILE_FORCE=1
+        ;;
       '')
         shift "$FLAGSHIFT"
         break
@@ -165,7 +172,7 @@ build_remote_macos() {
   trap unlockfile_ssh EXIT
   sh_c ssh "$REMOTE_HOST" mkdir -p src
   sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/"
-  sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \
+  sh_c ssh "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \
 HW_BUILD_DIR=$HW_BUILD_DIR \
 VERSION=$VERSION \
 OS=$OS \
@@ -183,7 +190,7 @@ build_remote_linux() {
   trap unlockfile_ssh EXIT
   sh_c ssh "$REMOTE_HOST" mkdir -p src
   sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/"
-  sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \
+  sh_c ssh "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \
 HW_BUILD_DIR=$HW_BUILD_DIR \
 VERSION=$VERSION \
 OS=$OS \
diff --git a/ci/sub b/ci/sub
index 65baeaa0e..df51b9089 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 65baeaa0e48fff12b12b1d04a0b013ba71e20add
+Subproject commit df51b90892737ebe9feca3dd982bcdfc7f684834