diff --git a/src/BackOffice.BFF.WebApi/Common/Mappings/GeneralMapping.cs b/src/BackOffice.BFF.WebApi/Common/Mappings/GeneralMapping.cs
index d82c1d7..924942f 100644
--- a/src/BackOffice.BFF.WebApi/Common/Mappings/GeneralMapping.cs
+++ b/src/BackOffice.BFF.WebApi/Common/Mappings/GeneralMapping.cs
@@ -60,5 +60,9 @@ public class GeneralMapping : IRegister
 
         config.NewConfig<byte[], Google.Protobuf.ByteString>()
             .MapWith(src => Google.Protobuf.ByteString.CopyFrom(src));
+
+        // MediatR Unit to Google.Protobuf.Empty
+        config.NewConfig<MediatR.Unit, Google.Protobuf.WellKnownTypes.Empty>()
+            .MapWith(_ => new Google.Protobuf.WellKnownTypes.Empty());
     }
 }
diff --git a/src/BackOffice.BFF.WebApi/appsettings.json.bak b/src/BackOffice.BFF.WebApi/appsettings.Staging.json
similarity index 87%
rename from src/BackOffice.BFF.WebApi/appsettings.json.bak
rename to src/BackOffice.BFF.WebApi/appsettings.Staging.json
index ae91ed9..df3d34a 100644
--- a/src/BackOffice.BFF.WebApi/appsettings.json.bak
+++ b/src/BackOffice.BFF.WebApi/appsettings.Staging.json
@@ -11,8 +11,7 @@
   },
   "GrpcChannelOptions": {
     "FMSMSAddress": "https://dl.afrino.co",
-    "CMSMSAddress": "https://cms.kbs1.ir"
-//    "CMSMSAddress": "https://localhost:32846"
+    "CMSMSAddress": "http://cms-svc"
   },
   "Authentication": {
     "Authority": "https://ids.domain.com/",
@@ -21,9 +20,7 @@
   "Kavenegar": {
     "Sender": "1000001110100",
     "ApiKey": "497263626F32626A48685A6137524C4F78575A766E4C74694A556B79317648424964655030682B554545413D"
-  }
-}
-,
+  },
   "Seq": {
     "ServerUrl": "http://seq-svc:5341",
     "ApiKey": ""