diff --git a/modules/mesh-control/module.json b/modules/mesh-control/module.json
index 1e65f17..3345782 100644
--- a/modules/mesh-control/module.json
+++ b/modules/mesh-control/module.json
@@ -26,11 +26,11 @@
       "mode": "0700"
     },
     {
-      "id": "broker-env",
+      "id": "control-env",
       "type": "file",
-      "path": "/var/lib/mesh/mesh-control/broker.env",
+      "path": "/var/lib/mesh/mesh-control/control.env",
       "mode": "0600",
-      "content": "MESH_BROKER_AMQP=${secret:broker}\nMESH_BROKER_MANAGEMENT=${secret:broker-management}\nMESH_BROKER_ADDRESS=${machine:at}:5671\n"
+      "content": "MESH_STORE_INVENTORY=${secret:inventory}\nMESH_STORE_IDENTITY=${secret:identity}\nMESH_STORE_LICENCES=${secret:licences}\nMESH_BROKER_AMQP=${secret:broker}\nMESH_BROKER_MANAGEMENT=${secret:broker-management}\nMESH_BROKER_ADDRESS=${machine:at}:5671\n"
     },
     {
       "id": "server",
@@ -42,27 +42,16 @@
         "serve"
       ],
       "env-file": [
-        "/var/lib/mesh/mesh-control/broker.env"
+        "/var/lib/mesh/mesh-control/control.env"
       ],
       "env": {
-        "MESH_STORE_INVENTORY_FILE": "/run/secrets/inventory",
-        "MESH_STORE_IDENTITY_FILE": "/run/secrets/identity",
-        "MESH_STORE_LICENCES_FILE": "/run/secrets/licences",
         "MESH_BROKER_CERTIFICATE": "/broker-tls/tls.crt"
       },
       "volumes": [
-        "mesh-broker-tls:/broker-tls:ro",
-        "/var/lib/mesh/mesh-control/inventory:/run/secrets/inventory:ro",
-        "/var/lib/mesh/mesh-control/identity:/run/secrets/identity:ro",
-        "/var/lib/mesh/mesh-control/licences:/run/secrets/licences:ro"
+        "mesh-broker-tls:/broker-tls:ro"
       ],
       "restart-on": [
-        "needs-inventory",
-        "needs-identity",
-        "needs-licences",
-        "needs-broker",
-        "needs-broker-management",
-        "broker-env"
+        "control-env"
       ]
     }
   ]