diff --git a/Common/Types/Monitor/MonitorCriteriaInstance.ts b/Common/Types/Monitor/MonitorCriteriaInstance.ts
index fec432db96..a8fae437ab 100644
--- a/Common/Types/Monitor/MonitorCriteriaInstance.ts
+++ b/Common/Types/Monitor/MonitorCriteriaInstance.ts
@@ -104,7 +104,8 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
         if (
             arg.monitorType === MonitorType.Ping ||
             arg.monitorType === MonitorType.IP ||
-            arg.monitorType === MonitorType.Port
+            arg.monitorType === MonitorType.Port || 
+            arg.monitorType === MonitorType.Server
         ) {
             monitorCriteriaInstance.data = {
                 id: ObjectID.generate().toString(),
diff --git a/InfrastructureAgent/package.json b/InfrastructureAgent/package.json
index b5c0d000b7..748fc5211b 100644
--- a/InfrastructureAgent/package.json
+++ b/InfrastructureAgent/package.json
@@ -5,7 +5,7 @@
   "description": "",
   "main": "./build/dist/Index.js",
   "scripts": {
-    "start": "node --require ts-node/register Index.ts",
+    "start": "node --require ts-node/register Index.ts $npm_config_services",
     "compile": "tsc",
     "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
     "dev": "npx nodemon",