diff --git a/scripts/arm_iso_build.sh b/scripts/arm_iso_build.sh
new file mode 100755
index 0000000..54cdb85
--- /dev/null
+++ b/scripts/arm_iso_build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+exec "${SABAYON_MOLECULE_HOME}"/scripts/iso_build.sh "arm" "$@"
diff --git a/scripts/arm_iso_build_locked.sh b/scripts/arm_iso_build_locked.sh
new file mode 100755
index 0000000..734bcda
--- /dev/null
+++ b/scripts/arm_iso_build_locked.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+
+exec "${SABAYON_MOLECULE_HOME}/scripts/iso_build_locked.sh" "arm_iso_build.sh" "${@}"
diff --git a/scripts/iso_build_locked.sh b/scripts/iso_build_locked.sh
index 68f3cce..3c9e9f5 100755
--- a/scripts/iso_build_locked.sh
+++ b/scripts/iso_build_locked.sh
@@ -31,6 +31,6 @@ SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
 
     "${SABAYON_MOLECULE_HOME}/scripts/${BUILD_SCRIPT_NAME}" "${@}"
 
-) 9> "${ISO_BUILD_LOCK}"
+) 9> "/tmp/.iso_build_locked.sh.${BUILD_SCRIPT_NAME}.lock"
 
 exit ${?}