diff --git a/cannon/scripts/build-legacy-cannons.sh b/cannon/scripts/build-legacy-cannons.sh
index e6e3be05557a9..2ed0fd48ba855 100755
--- a/cannon/scripts/build-legacy-cannons.sh
+++ b/cannon/scripts/build-legacy-cannons.sh
@@ -34,7 +34,11 @@ function buildVersion() {
   git checkout "${TAG}" > "${LOG_FILE}" 2>&1
   git submodule update --init --recursive >> "${LOG_FILE}" 2>&1
   rm -rf "${BIN_DIR}/cannon-"*
-  make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1
+  if [ -f "${REPO_DIR}/cannon/justfile" ] && (cd "${REPO_DIR}/cannon" && just --show cannon-embeds &>/dev/null); then
+    (cd "${REPO_DIR}/cannon" && just cannon-embeds >> "${LOG_FILE}" 2>&1)
+  else
+    make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1
+  fi
   cp "${BIN_DIR}/cannon-"* "${EMBEDS_DIR}/"
   echo "Built ${TAG} with versions:"
   (cd "${BIN_DIR}" && ls cannon-*)
@@ -52,7 +56,11 @@ done
 cd "${CANNON_DIR}"
 LOG_FILE="${LOGS_DIR}/build-current.txt"
 echo "Building current version of cannon Logs: ${LOG_FILE}"
-make cannon > "${LOG_FILE}" 2>&1
+if [ -f justfile ] && just --show cannon &>/dev/null; then
+  just cannon > "${LOG_FILE}" 2>&1
+else
+  make cannon > "${LOG_FILE}" 2>&1
+fi
 
 echo "All cannon versions successfully built and available in ${EMBEDS_DIR}"
 "${CANNON_DIR}/bin/cannon" list
diff --git a/op-alt-da/Dockerfile b/op-alt-da/Dockerfile
index 44fb2e7fcefd8..b50d10eae061c 100644
--- a/op-alt-da/Dockerfile
+++ b/op-alt-da/Dockerfile
@@ -1,6 +1,6 @@
 ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER AS builder
-# See "make golang-docker" and /ops/docker/op-stack-go
+# See "just golang-docker" and /ops/docker/op-stack-go
 
 FROM alpine:3.20
 
diff --git a/op-dispute-mon/Dockerfile b/op-dispute-mon/Dockerfile
index 9f215eb073db6..abd7e4f245c34 100644
--- a/op-dispute-mon/Dockerfile
+++ b/op-dispute-mon/Dockerfile
@@ -1,6 +1,6 @@
 ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER AS builder
-# See "make golang-docker" and /ops/docker/op-stack-go
+# See "just golang-docker" and /ops/docker/op-stack-go
 
 FROM alpine:3.20
 
diff --git a/op-program/scripts/build-prestates.sh b/op-program/scripts/build-prestates.sh
index 8507237433277..cbe8de998364b 100755
--- a/op-program/scripts/build-prestates.sh
+++ b/op-program/scripts/build-prestates.sh
@@ -106,7 +106,11 @@ EOF
 
   rm -rf "${BIN_DIR}"
   rm -rf rust/kona/prestate-artifacts-*
-  make reproducible-prestate >> "${log_file}" 2>&1
+  if [ -f justfile ] && just --show reproducible-prestate &>/dev/null; then
+    just reproducible-prestate >> "${log_file}" 2>&1
+  else
+    make reproducible-prestate >> "${log_file}" 2>&1
+  fi
 
   if [[ "${version}" =~ ^op-program/v ]]; then
     if [ -f "${BIN_DIR}/prestate-proof.json" ]; then