diff --git a/config/local-beckn-one-bap.yaml b/config/local-beckn-one-bap.yaml
index e8d1e39..67ae76e 100644
--- a/config/local-beckn-one-bap.yaml
+++ b/config/local-beckn-one-bap.yaml
@@ -70,7 +70,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - validateSign
@@ -130,7 +130,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - addRoute
diff --git a/config/local-beckn-one-bpp.yaml b/config/local-beckn-one-bpp.yaml
index a5c23de..af5ff8f 100644
--- a/config/local-beckn-one-bpp.yaml
+++ b/config/local-beckn-one-bpp.yaml
@@ -125,7 +125,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bpp          
       steps:
         - addRoute
diff --git a/config/local-dev.yaml b/config/local-dev.yaml
index b645350..dc74eb8 100644
--- a/config/local-dev.yaml
+++ b/config/local-dev.yaml
@@ -59,7 +59,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - addRoute
@@ -103,7 +103,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - addRoute
diff --git a/config/local-simple.yaml b/config/local-simple.yaml
index b8127e0..327e344 100644
--- a/config/local-simple.yaml
+++ b/config/local-simple.yaml
@@ -69,7 +69,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - validateSign
@@ -115,7 +115,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - addRoute
diff --git a/config/onix-bap/adapter.yaml b/config/onix-bap/adapter.yaml
index d5f437c..c917daa 100644
--- a/config/onix-bap/adapter.yaml
+++ b/config/onix-bap/adapter.yaml
@@ -62,7 +62,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - validateSign
@@ -112,7 +112,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - validateSchema
diff --git a/config/onix-bpp/adapter.yaml b/config/onix-bpp/adapter.yaml
index 1ca4064..7bb0fe2 100644
--- a/config/onix-bpp/adapter.yaml
+++ b/config/onix-bpp/adapter.yaml
@@ -63,7 +63,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bpp
       steps:
         - validateSign
@@ -113,7 +113,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bpp
       steps:
         - validateSchema
diff --git a/config/onix/adapter.yaml b/config/onix/adapter.yaml
index dbd67e3..403f616 100644
--- a/config/onix/adapter.yaml
+++ b/config/onix/adapter.yaml
@@ -62,7 +62,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - validateSign
@@ -112,7 +112,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bap
       steps:
         - validateSchema
@@ -163,7 +163,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bpp
       steps:
         - validateSign
@@ -213,7 +213,7 @@ modules:
         middleware:
           - id: reqpreprocessor
             config:
-              uuidKeys: transaction_id,message_id
+              contextKeys: transaction_id,message_id
               role: bpp
       steps:
         - validateSchema