diff --git a/apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js b/apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js
index dc26a3e09..fe8744873 100644
--- a/apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js
+++ b/apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js
@@ -4,6 +4,7 @@ async function DocumentAftersave(request) {
       console.log('new entry is insert in contracts_Document');
       const createdAt = request.object.get('createdAt');
       const Folder = request.object.get('Type');
+      const ip = request?.headers?.['x-real-ip'] || '';
       if (createdAt && Folder === undefined) {
         // console.log("IN If condition")
         const TimeToCompleteDays = request.object.get('TimeToCompleteDays');
@@ -12,6 +13,7 @@ async function DocumentAftersave(request) {
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
+        updateQuery.set('OriginIp', ip);
         await updateQuery.save(null, { useMasterKey: true });
       } else if (createdAt && Folder === 'AIDoc') {
         const TimeToCompleteDays = request.object.get('TimeToCompleteDays');
@@ -24,6 +26,7 @@ async function DocumentAftersave(request) {
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
+        updateQuery.set('OriginIp', ip);
         await updateQuery.save(null, { useMasterKey: true });
       }
 
diff --git a/apps/OpenSignServer/cloud/parsefunction/pdf/GenerateCertificate.js b/apps/OpenSignServer/cloud/parsefunction/pdf/GenerateCertificate.js
index 1d8fc2d15..c3ce72ac9 100644
--- a/apps/OpenSignServer/cloud/parsefunction/pdf/GenerateCertificate.js
+++ b/apps/OpenSignServer/cloud/parsefunction/pdf/GenerateCertificate.js
@@ -23,6 +23,7 @@ export default async function GenerateCertificate(docDetails) {
   const generateAt = new Date();
   const generatedUTCTime = generateAt.toUTCString();
   const generatedOn = 'Generated On ' + generatedUTCTime;
+  const OriginIp = docDetails?.OriginIp || '';
   const company = docDetails?.ExtUserPtr?.Company || '';
   const auditTrail =
     docDetails.AuditTrail?.length > 1
@@ -229,7 +230,7 @@ export default async function GenerateCertificate(docDetails) {
     font: timesRomanFont,
     color: textKeyColor,
   });
-  page.drawText(`152.58.21.622`, {
+  page.drawText(`${OriginIp}`, {
     x: 130,
     y: 505,
     size: text,
diff --git a/apps/OpenSignServer/index.js b/apps/OpenSignServer/index.js
index a9432da6b..e06f2e40e 100644
--- a/apps/OpenSignServer/index.js
+++ b/apps/OpenSignServer/index.js
@@ -166,11 +166,6 @@ app.use(cors());
 app.use(express.json({ limit: '50mb' }));
 app.use(express.urlencoded({ limit: '50mb', extended: true }));
 app.use(function (req, res, next) {
-  // console.log("req ", req.headers);
-  // console.log("x-forwarded-for", req.headers["x-forwarded-for"]);
-  // console.log("req.ip", req.ip);
-  // console.log("req.socket.remoteAddress; ", req.socket.remoteAddress);
-  // console.log("ip", ip.address());
   req.headers['x-real-ip'] = getUserIP(req);
   next();
 });
@@ -230,7 +225,7 @@ if (!process.env.TESTING) {
   // Set the Keep-Alive and headers timeout to 100 seconds
   httpServer.keepAliveTimeout = 100000; // in milliseconds
   httpServer.headersTimeout = 100000; // in milliseconds
-  httpServer.listen(port, function () {
+  httpServer.listen({ port: port, host: '0.0.0.0' }, function () {
     console.log('parse-server-example running on port ' + port + '.');
     const isWindows = process.platform === 'win32';
     // console.log('isWindows', isWindows);