diff --git a/module.json b/module.json
index 05fab59..4dfaa22 100644
--- a/module.json
+++ b/module.json
@@ -18,13 +18,13 @@
     }
   ],
   "own-secrets": {
-    "inventory": "/var/lib/mesh/mesh-controller/inventory",
-    "identity": "/var/lib/mesh/mesh-controller/identity",
-    "licences": "/var/lib/mesh/mesh-controller/licences",
-    "broker": "/var/lib/mesh/mesh-controller/broker",
-    "broker-management": "/var/lib/mesh/mesh-controller/broker-management",
-    "broker-address": "/var/lib/mesh/mesh-controller/broker-address",
-    "bus": "/var/lib/mesh/mesh-controller/bus"
+    "inventory": "${dir:mesh-state}/inventory",
+    "identity": "${dir:mesh-state}/identity",
+    "licences": "${dir:mesh-state}/licences",
+    "broker": "${dir:mesh-state}/broker",
+    "broker-management": "${dir:mesh-state}/broker-management",
+    "broker-address": "${dir:mesh-state}/broker-address",
+    "bus": "${dir:mesh-state}/bus"
   },
   "secrets-owner": "65534:65534",
   "prepares": true,
@@ -46,8 +46,8 @@
     {
       "id": "mesh-state",
       "type": "directory",
-      "path": "/var/lib/mesh/mesh-controller",
-      "mode": "0700"
+      "mode": "0700",
+      "place": "mesh"
     },
     {
       "id": "server",
@@ -73,13 +73,13 @@
       },
       "volumes": [
         "/var/lib/mesh-broker-tls:/broker-tls:ro",
-        "/var/lib/mesh/mesh-controller/inventory:/run/secrets/inventory:ro",
-        "/var/lib/mesh/mesh-controller/identity:/run/secrets/identity:ro",
-        "/var/lib/mesh/mesh-controller/licences:/run/secrets/licences:ro",
-        "/var/lib/mesh/mesh-controller/broker:/run/secrets/broker:ro",
-        "/var/lib/mesh/mesh-controller/bus:/run/secrets/bus:ro",
-        "/var/lib/mesh/mesh-controller/broker-management:/run/secrets/broker-management:ro",
-        "/var/lib/mesh/mesh-controller/broker-address:/run/secrets/broker-address:ro"
+        "${dir:mesh-state}/inventory:/run/secrets/inventory:ro",
+        "${dir:mesh-state}/identity:/run/secrets/identity:ro",
+        "${dir:mesh-state}/licences:/run/secrets/licences:ro",
+        "${dir:mesh-state}/broker:/run/secrets/broker:ro",
+        "${dir:mesh-state}/bus:/run/secrets/bus:ro",
+        "${dir:mesh-state}/broker-management:/run/secrets/broker-management:ro",
+        "${dir:mesh-state}/broker-address:/run/secrets/broker-address:ro"
       ],
       "artifact": "server",
       "restart-on": [