diff --git a/pyproject.toml b/pyproject.toml
index 7e93eab..1070897 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "toltecmk"
-version = "0.5.3"
+version = "0.5.4"
 authors = [
   { name="Mattéo Delabre", email="git.matteo@delab.re" },
   { name="Eeems", email="eeems@eeems.email" },
diff --git a/toltec/builder.py b/toltec/builder.py
index 78ef117..8ffc1b0 100644
--- a/toltec/builder.py
+++ b/toltec/builder.py
@@ -348,6 +348,15 @@ def _run_script(  # pylint: disable=R0913, R0917, R0914
                 )
             )
 
+        elif arch.startswith("rm1") or arch.startswith("rm2"):
+            pre_script.extend(
+                (
+                    "if [ -f /opt/x-tools/switch-arm.sh ]; then",
+                    "  source /opt/x-tools/switch-arm.sh",
+                    "fi",
+                )
+            )
+
         return bash.run_script_in_container(
             self.docker,
             image=self.IMAGE_PREFIX + image,