diff --git a/Common/Server/Utils/Monitor/MonitorResource.ts b/Common/Server/Utils/Monitor/MonitorResource.ts
index d3fd5eaa04..916cf4ccb9 100644
--- a/Common/Server/Utils/Monitor/MonitorResource.ts
+++ b/Common/Server/Utils/Monitor/MonitorResource.ts
@@ -418,6 +418,7 @@ export default class MonitorResourceUtil {
     logger.debug(
       `${dataToProcess.monitorId.toString()} - Processing monitor step...`,
     );
+    
     response = await MonitorResourceUtil.processMonitorStep({
       dataToProcess: dataToProcess,
       monitorStep: monitorStep,
diff --git a/InfrastructureAgent/build-msi.sh b/InfrastructureAgent/build-msi.sh
index 7bb56d9b07..ade352aaa3 100644
--- a/InfrastructureAgent/build-msi.sh
+++ b/InfrastructureAgent/build-msi.sh
@@ -41,7 +41,7 @@ for i in "${!BINARIES[@]}"; do
   ARCH="${ARCHES[$i]}"
   WXS_INPUT_FILE="./windows/app-$ARCH-template.wxs"
   WXS_OUTPUT_FILE="./windows/app-$ARCH.wxs"
-  MSI_FILE="$OUTPUT_DIR/$APP_NAME-$APP_VERSION-$ARCH.msi"
+  MSI_FILE="$OUTPUT_DIR/$APP_NAME-$ARCH.msi"
 
   # log binary and arch
   echo "Building MSI for binary: $BINARY and arch: $ARCH"
diff --git a/Worker/Jobs/ServerMonitor/CheckOnlineStatus.ts b/Worker/Jobs/ServerMonitor/CheckOnlineStatus.ts
index a7bd584d20..fb00b2d0f3 100644
--- a/Worker/Jobs/ServerMonitor/CheckOnlineStatus.ts
+++ b/Worker/Jobs/ServerMonitor/CheckOnlineStatus.ts
@@ -32,6 +32,7 @@ RunCron(
           monitorSteps: true,
           serverMonitorRequestReceivedAt: true,
           createdAt: true,
+          serverMonitorResponse: true,
         },
         limit: LIMIT_MAX,
         skip: 0,
@@ -53,8 +54,8 @@ RunCron(
             monitorId: monitor.id!,
             onlyCheckRequestReceivedAt: true,
             requestReceivedAt:
-              monitor.serverMonitorRequestReceivedAt || monitor.createdAt!,
-            hostname: "",
+              monitor.serverMonitorRequestReceivedAt || monitor.serverMonitorResponse?.requestReceivedAt || monitor.createdAt!,
+            hostname: monitor.serverMonitorResponse?.hostname || "",
           };
 
           await MonitorResourceUtil.monitorResource(serverMonitorResponse);