diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index e139e5ca..f392c48b 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -191,7 +191,9 @@ public class DaemonParameters {
 
     public Path daemonStorage() {
         return value(Environment.MVND_DAEMON_STORAGE)
+                .orEnvironmentVariable()
                 .orSystemProperty()
+                .orLocalProperty(provider, globalPropertiesPath())
                 .orDefault(
                         () -> userHome().resolve(".m2/mvnd/registry/" + BuildProperties.getInstance().getVersion()).toString())
                 .asPath();
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
index 472f04a0..c703059e 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
@@ -125,7 +125,7 @@ public enum Environment {
      * The directory under which the daemon stores its registry, log files, etc.
      * Default: <code>${user.home}/.m2/mvnd</code>
      */
-    MVND_DAEMON_STORAGE("mvnd.daemonStorage", null, null, OptionType.PATH, Flags.NONE),
+    MVND_DAEMON_STORAGE("mvnd.daemonStorage", "MVND_DAEMON_STORAGE", null, OptionType.PATH, Flags.NONE),
     /**
      * The path to the daemon registry.
      * Default: <code>${mvnd.daemonStorage}/registry.bin</code>