diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
index 60a57b2..b3349a7 100644
--- a/.github/workflows/pipeline.yaml
+++ b/.github/workflows/pipeline.yaml
@@ -43,13 +43,13 @@ jobs:
           GOOGLE_ARTIFACT_REPO: ${{secrets.GOOGLE_ARTIFACT_REPO}}
           HYPERSIGN_JSON: ${{secrets.HYPERSIGN_JSON}}
         run:
-          docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.1 .
+          docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.2 .
 
-          docker push  $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.1
+          docker push  $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.2
 
-          docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.1  . -f Txn.Dockerfile
+          docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.2  . -f Txn.Dockerfile
 
-          docker push $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.1
+          docker push $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.2
 
   Deploy-Pipeline:
     needs: [Build-Pipeline]
@@ -76,7 +76,7 @@ jobs:
       - name: "Configure kubectl"
         run: gcloud container clusters get-credentials hypermine-gke --region=asia-south1
       - name: Replace tags
-        run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__LATEST_RELEASE_TAG__#v5.4.0-rc.1#" {} \;
+        run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__LATEST_RELEASE_TAG__#v5.4.0-rc.2#" {} \;
 
       - name: "Replace secrets"
         run: find .deploy/deployment.yaml -type f -exec sed  -i ''s/__GOOGLE_ARTIFACT_URL__/${{ secrets.GOOGLE_ARTIFACT_URL }}/g'' {} \;
diff --git a/src/routes/edvRoutes.ts b/src/routes/edvRoutes.ts
index b930870..715b562 100644
--- a/src/routes/edvRoutes.ts
+++ b/src/routes/edvRoutes.ts
@@ -73,6 +73,7 @@ export = (hypersign, edvClient) => {
     try {
       const { user, document } = req.body;
       const userData: IUserModel = user as IUserModel;
+      userData.nameSpace= user.nameSpace || 'default';
 
       let response: IUserModel;
       let status = 201;
@@ -103,6 +104,8 @@ export = (hypersign, edvClient) => {
         const userEdvDoc = {
           encryptedMessage: document.encryptedMessage,
           userId: userData.userId,
+          nameSpace:userData.nameSpace
+
         };
 
         console.log("EncMessage " + userEdvDoc.encryptedMessage);
@@ -112,6 +115,8 @@ export = (hypersign, edvClient) => {
         );
         const edvDocument = edvClient.prepareEdvDocument(userEdvDoc, [
           { index: "content.userId", unique: true },
+          { index: "content.nameSpace" },
+
         ]);
         console.log(
           "edvRoutest:: sync(): Before updating the db with docid  " + userDocId