diff --git a/scripts/build-bundle.sh b/scripts/build-bundle.sh
index b2e82f4..8bd3373 100755
--- a/scripts/build-bundle.sh
+++ b/scripts/build-bundle.sh
@@ -116,5 +116,11 @@ cp "${HOST_EXEC_BIN}" "${bundle_dir}/artifacts/"
 cp "${HOST_CLI_BIN}" "${bundle_dir}/artifacts/"
 
 mkdir -p "$(dirname "${OUTPUT}")"
-tar --no-mac-metadata --no-xattrs -czf "${OUTPUT}" -C "${bundle_dir}" artifacts
+if tar --help 2>/dev/null | grep -q -- '--no-mac-metadata'; then
+  tar --no-mac-metadata --no-xattrs -czf "${OUTPUT}" -C "${bundle_dir}" artifacts
+elif tar --help 2>/dev/null | grep -q -- '--no-xattrs'; then
+  tar --no-xattrs -czf "${OUTPUT}" -C "${bundle_dir}" artifacts
+else
+  tar -czf "${OUTPUT}" -C "${bundle_dir}" artifacts
+fi
 echo "Bundle created at ${OUTPUT}"
diff --git a/scripts/run-examples.sh b/scripts/run-examples.sh
index caa48e3..e7c71a7 100755
--- a/scripts/run-examples.sh
+++ b/scripts/run-examples.sh
@@ -264,12 +264,16 @@ if [ "$MODE" = "compose" ] || [ "$MODE" = "k8s" ]; then
 else
   KZG_PATH="${KZG_HOST_PATH}"
 fi
+if [ -n "${DEMO_VALIDATORS}" ]; then
+  export NOMOS_DEMO_VALIDATORS="${DEMO_VALIDATORS}"
+fi
+if [ -n "${DEMO_EXECUTORS}" ]; then
+  export NOMOS_DEMO_EXECUTORS="${DEMO_EXECUTORS}"
+fi
 POL_PROOF_DEV_MODE=true \
 NOMOS_TESTNET_IMAGE="${IMAGE}" \
 NOMOS_CIRCUITS="${HOST_BUNDLE_PATH}" \
 NOMOS_KZGRS_PARAMS_PATH="${KZG_PATH}" \
-${DEMO_VALIDATORS:+NOMOS_DEMO_VALIDATORS="${DEMO_VALIDATORS}"} \
-${DEMO_EXECUTORS:+NOMOS_DEMO_EXECUTORS="${DEMO_EXECUTORS}"} \
 COMPOSE_DEMO_RUN_SECS="${RUN_SECS}" \
 LOCAL_DEMO_RUN_SECS="${RUN_SECS}" \
 K8S_DEMO_RUN_SECS="${RUN_SECS}" \