diff --git a/bookstore/package.json b/bookstore/package.json
index ed127403..65c9bee3 100644
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -25,17 +25,7 @@
         "kind": "odata",
         "model": "@capire/orders"
       },
-      "messaging": {
-        "[development]": {
-          "kind": "file-based-messaging"
-        },
-        "[hybrid]": {
-          "kind": "enterprise-messaging-shared"
-        },
-        "[production]": {
-          "kind": "enterprise-messaging"
-        }
-      },
+      "messaging": true,
       "db": {
         "kind": "sql"
       }
diff --git a/event-mesh.json b/event-mesh.json
index 964f3b44..0a7d0428 100644
--- a/event-mesh.json
+++ b/event-mesh.json
@@ -1,7 +1,5 @@
 {
-  "emname": "samples-emname",
   "version": "1.1.0",
-  "namespace": "default/samples/1",
   "options": {
     "management": true,
     "messagingrest": true,
@@ -10,7 +8,7 @@
   "rules": {
     "topicRules": {
       "publishFilter": [
-        "${namespace}/*"
+        "*"
       ],
       "subscribeFilter": [
         "*"
@@ -18,10 +16,10 @@
     },
     "queueRules": {
       "publishFilter": [
-        "${namespace}/*"
+        "*"
       ],
       "subscribeFilter": [
-        "${namespace}/*"
+        "*"
       ]
     }
   },
diff --git a/mta.yaml b/mta.yaml
index b76eeae5..8270f259 100644
--- a/mta.yaml
+++ b/mta.yaml
@@ -92,3 +92,6 @@ resources:
       service: enterprise-messaging
       service-plan: default
       path: ./event-mesh.json
+      config: 
+        emname: bookstore-${org}-${space}
+        namespace: cap/samples/${space}
diff --git a/orders/package.json b/orders/package.json
index d2f501c5..534b1941 100644
--- a/orders/package.json
+++ b/orders/package.json
@@ -12,6 +12,7 @@
   },
   "cds": {
     "requires": {
+      "messaging": true,
       "db": true
     }
   }