diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Incoming Payment.bru
index 6fffd0742c..222f68ceb3 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru
index 4d9e3a2a63..6fb3d5c951 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -35,7 +35,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
   }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get Outgoing Payment.bru
index 4946e1b040..a1a4c417bd 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru
index 5b9b0277a9..788684b60b 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru	
@@ -32,6 +32,8 @@ script:post-response {
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
   
   const authUrl = url.parse(body?.authServer)
+  const receiverTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('receiverTenantId', receiverTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru
index 384cfa6282..3338e21cdd 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru	
@@ -28,11 +28,13 @@ script:post-response {
   }
   
   const body = res.getBody()
-
+  
   bru.setEnvVar("senderAssetCode", body?.assetCode)
   bru.setEnvVar("senderAssetScale", body?.assetScale)
   
   const authUrl = url.parse(body?.authServer)
+  const senderTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('senderTenantId', senderTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru
index 6335a518af..70eb34c474 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru
index 5c8213f66a..fa033b3171 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru
index afc6464ee6..85683d2983 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru	
@@ -5,13 +5,14 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
 
 headers {
   Authorization: GNAP {{accessToken}}
+  x-operator-secret: {{operatorApiSecret}}
 }
 
 body:json {
@@ -41,7 +42,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
   }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru
index e14eaa6536..f4f30599d3 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -34,7 +34,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
   }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru
index a7708217f4..5f0e702830 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/quotes
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
       "walletAddress": "{{senderWalletAddress}}",
-      "receiver": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+      "receiver": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
       "method": "ilp"
   }
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Get Outgoing Payment.bru
index 4946e1b040..a1a4c417bd 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Get Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Get Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru
index 9e5acc50c4..9c57818fde 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru	
@@ -22,22 +22,24 @@ script:pre-request {
 
 script:post-response {
   const url = require('url')
-
+  
   if (res.getStatus() !== 200) {
     return
   }
-
+  
   const body = res.getBody()
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
   
   const authUrl = url.parse(body?.authServer)
+  const receiverTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar("receiverTenantId", receiverTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
   ){
       const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
-      bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
+      bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port);
   } else {
       bru.setEnvVar("receiverOpenPaymentsAuthHost", body?.authServer);
   }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru
index 9665a40e32..e371cf5f8b 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru	
@@ -32,15 +32,18 @@ script:post-response {
   bru.setEnvVar("senderAssetScale", body?.assetScale)
   
   const authUrl = url.parse(body?.authServer)
+  const senderTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar("senderTenantId", senderTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
   ){
       const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
-      bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
+      bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port);
   } else {
       bru.setEnvVar("senderOpenPaymentsAuthHost", body?.authServer);
   }
+  
 }
 
 tests {
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Incoming Payment.bru
index 6335a518af..70eb34c474 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Outgoing Payment.bru
index 5be7a46476..5460d7a019 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Quote.bru b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Quote.bru
index 3c0736670d..a8df671fe5 100644
--- a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Quote.bru	
+++ b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Quote.bru	
@@ -5,11 +5,15 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }
 
+headers {
+  x-operator-secret: {{operatorApiSecret}}
+}
+
 body:json {
   {
       "access_token": {
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru
index 071e7df0be..8bb0d8ad12 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
@@ -36,7 +36,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
     bru.setEnvVar("quoteDebitAmount", JSON.stringify({
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru
index 6bdb591816..5abaf4db52 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
     "walletAddress": "{{senderWalletAddress}}",
-    "incomingPayment": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+    "incomingPayment": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
     "debitAmount": {
       "value": "300",
       "assetCode": "USD",
@@ -40,7 +40,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
   }
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru
index 6dce96ac06..82f99a5669 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
     "walletAddress": "{{senderWalletAddress}}",
-    "incomingPayment": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+    "incomingPayment": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
     "debitAmount": {
       "value": "300",
       "assetCode": "USD",
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru
index 814d2171de..9b6300a5b8 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
     "walletAddress": "{{senderWalletAddress}}",
-    "incomingPayment": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+    "incomingPayment": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
     "debitAmount": {
       "value": "300",
       "assetCode": "USD",
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Get Outgoing Payment.bru
index 7c38f47444..3eb35e13c8 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Get Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Get Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru
index d59f39b24f..891c33a42a 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru	
@@ -28,11 +28,13 @@ script:post-response {
   }
   
   const body = res.getBody()
-
+  
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
   
   const authUrl = url.parse(body?.authServer)
+  const receiverTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('receiverTenantId', receiverTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru
index 9665a40e32..9b63145285 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru	
@@ -32,6 +32,8 @@ script:post-response {
   bru.setEnvVar("senderAssetScale", body?.assetScale)
   
   const authUrl = url.parse(body?.authServer)
+  const senderTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('senderTenantId', senderTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Incoming Payment.bru
index 6335a518af..70eb34c474 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Outgoing Payment.bru
index 5be7a46476..5460d7a019 100644
--- a/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Complete Incoming Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Complete Incoming Payment.bru
index 0debce0d02..3e8177753d 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Complete Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Complete Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}/complete
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}/complete
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru
index c718828e1c..37b266901e 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
@@ -42,7 +42,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
   }
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment -Unauthenticated-.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment -Unauthenticated-.bru
index d282f8123d..abba6b742a 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment -Unauthenticated-.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment -Unauthenticated-.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment.bru
index 797cf9ae66..cb3cefd4e7 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/List Incoming Payments.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/List Incoming Payments.bru
index 9fd7a87872..a8a628b22d 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/List Incoming Payments.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/List Incoming Payments.bru	
@@ -5,12 +5,12 @@ meta {
 }
 
 get {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments?first=10&wallet-address={{receiverWalletAddress}}
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments?first=10&wallet-address={{receiverWalletAddress}}
   body: none
   auth: none
 }
 
-query {
+params:query {
   first: 10
   wallet-address: {{receiverWalletAddress}}
   ~cursor: ea3bf38f-2719-4473-a0f7-4ba967d1d81b
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Create Outgoing Payment.bru
index 62ec4793f7..d0158e7223 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Create Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Create Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -16,7 +16,7 @@ headers {
 
 body:json {
   {
-      "walletAddress": {{senderWalletAddress}},
+      "walletAddress": "{{senderWalletAddress}}",
       "quoteId": "{{senderOpenPaymentsHost}}/quotes/{{quoteId}}",
       "metadata": {
           "description": "yolo",
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Get Outgoing Payment.bru
index a434aa6bfa..1af3991ab8 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Get Outgoing Payment.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/Get Outgoing Payment.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/List Outgoing Payments.bru b/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/List Outgoing Payments.bru
index d85bd35fa5..17b1bce0aa 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/List Outgoing Payments.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Outgoing Payments/List Outgoing Payments.bru	
@@ -5,12 +5,12 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments?first=2&wallet-address={{senderWalletAddress}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments?first=2&wallet-address={{senderWalletAddress}}
   body: none
   auth: none
 }
 
-query {
+params:query {
   first: 2
   wallet-address: {{senderWalletAddress}}
   ~cursor: ea3bf38f-2719-4473-a0f7-4ba967d1d81b
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru b/bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru
index 1e53624a2c..03bc78d913 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/quotes
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes
   body: json
   auth: none
 }
@@ -37,7 +37,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("quoteId", body.id.split("/").pop());
     bru.setEnvVar("quoteDebitAmount", JSON.stringify(body.debitAmount))
diff --git a/bruno/collections/Rafiki/Open Payments APIs/Quotes/Get Quote.bru b/bruno/collections/Rafiki/Open Payments APIs/Quotes/Get Quote.bru
index 008c63222f..273b72b97d 100644
--- a/bruno/collections/Rafiki/Open Payments APIs/Quotes/Get Quote.bru	
+++ b/bruno/collections/Rafiki/Open Payments APIs/Quotes/Get Quote.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/quotes/{{quoteId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes/{{quoteId}}
   body: none
   auth: none
 }
diff --git a/bruno/collections/Rafiki/Open Payments Auth APIs/Grants/Grant Request.bru b/bruno/collections/Rafiki/Open Payments Auth APIs/Grants/Grant Request.bru
index 0f5d41e8d7..5d4488504e 100644
--- a/bruno/collections/Rafiki/Open Payments Auth APIs/Grants/Grant Request.bru	
+++ b/bruno/collections/Rafiki/Open Payments Auth APIs/Grants/Grant Request.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }
diff --git a/bruno/collections/Rafiki/environments/Local Playground.bru b/bruno/collections/Rafiki/environments/Local Playground.bru
index 59244355df..45fb14ed6b 100644
--- a/bruno/collections/Rafiki/environments/Local Playground.bru	
+++ b/bruno/collections/Rafiki/environments/Local Playground.bru	
@@ -28,4 +28,5 @@ vars {
   authApiSignatureVersion: 1
   authApiSignatureSecret: rPoZpe9tVyBNCigm05QDco7WLcYa0xMao7lO5KG1XG4=
   assetIdTigerBeetle: 1
+  operatorApiSecret: tXhxCNRWuVOJs5W/CUgjsc+vBnKj0CVdqSb87EXN64E=
 }