diff --git a/modules/lavinmq/module.json b/modules/lavinmq/module.json
index 3d6e13b..a2afd95 100644
--- a/modules/lavinmq/module.json
+++ b/modules/lavinmq/module.json
@@ -7,6 +7,12 @@
       "scope": "mesh"
     }
   ],
+  "claims": [
+    {
+      "name": "mesh-broker",
+      "scope": "mesh"
+    }
+  ],
   "capabilities": [
     "container-runtime"
   ],
diff --git a/modules/mesh-controller/module.json b/modules/mesh-controller/module.json
index b48c435..14da2d4 100644
--- a/modules/mesh-controller/module.json
+++ b/modules/mesh-controller/module.json
@@ -7,7 +7,7 @@
   ],
   "claims": [
     {
-      "name": "the-controller",
+      "name": "mesh-controller",
       "scope": "mesh"
     }
   ],
diff --git a/modules/postgres/module.json b/modules/postgres/module.json
index 158e68a..6d27b72 100644
--- a/modules/postgres/module.json
+++ b/modules/postgres/module.json
@@ -7,6 +7,12 @@
       "scope": "mesh"
     }
   ],
+  "claims": [
+    {
+      "name": "mesh-store",
+      "scope": "mesh"
+    }
+  ],
   "capabilities": [
     "container-runtime"
   ],