diff --git a/projects/ArchR/packages/archr/profile.d/001-functions b/projects/ArchR/packages/archr/profile.d/001-functions
index b34003bf99..ae75bfa84e 100644
--- a/projects/ArchR/packages/archr/profile.d/001-functions
+++ b/projects/ArchR/packages/archr/profile.d/001-functions
@@ -82,7 +82,10 @@ function wait_lock() {
   do
     if (set -o noclobber; echo "$$" > "${J_CONF_LOCK}") 2>/dev/null
     then
-      trap 'rm -f "$lockfile"; exit $?' INT TERM EXIT
+      # Trap original referenciava $lockfile (variável inexistente)
+      # — o rm -f "" do INT/TERM virava no-op e deixava lock órfão se
+      # o script morresse antes do rm explícito no final.
+      trap 'rm -f "${J_CONF_LOCK}"; exit $?' INT TERM EXIT
       break
     else
      sleep 1
diff --git a/projects/ArchR/packages/archr/system.d/archr-automount.service b/projects/ArchR/packages/archr/system.d/archr-automount.service
index 9e1df19286..875f7f7703 100644
--- a/projects/ArchR/packages/archr/system.d/archr-automount.service
+++ b/projects/ArchR/packages/archr/system.d/archr-automount.service
@@ -1,6 +1,10 @@
 [Unit]
-Description=ArchR user autostart script
-Before=autostart.service
+Description=ArchR storage automount service
+# autostart.service é nome herdado do JELOS; em ArchR a unit real
+# chama-se archr-autostart.service. Sem o prefixo o Before= era
+# silenciosamente ignorado e o automount não tinha garantia de rodar
+# antes do autostart.
+Before=archr-autostart.service
 After=systemd-tmpfiles-setup.service
 RequiresMountsFor=/storage