diff --git a/tools/aio-aksedge-config.json b/tools/aio-aksedge-config.json
index 0b2c8ca..36bfc03 100644
--- a/tools/aio-aksedge-config.json
+++ b/tools/aio-aksedge-config.json
@@ -1,7 +1,8 @@
 {
-    "SchemaVersion": "1.15",
+    "SchemaVersion": "1.16",
     "Version": "1.0",
     "DeploymentType": "SingleMachineCluster",
+    "AioDeploy": false,
     "Init": {
         "ServiceIPRangeSize": 10
     },
diff --git a/tools/aksedge-config.json b/tools/aksedge-config.json
index e181554..1789713 100644
--- a/tools/aksedge-config.json
+++ b/tools/aksedge-config.json
@@ -1,7 +1,8 @@
 {
-    "SchemaVersion": "1.15",
+    "SchemaVersion": "1.16",
     "Version": "1.0",
     "DeploymentType": "SingleMachineCluster",
+    "AioDeploy": false,
     "Init": {
         "ServiceIPRangeSize": 10,
         "KmsPlugin":{
diff --git a/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psm1 b/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psm1
index ba1db2e..4b5fe52 100644
--- a/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psm1
+++ b/tools/modules/AksEdgeDeploy/AksEdgeDeploy.psm1
@@ -310,6 +310,8 @@ function UpgradeJsonFormat {
         $endip = $edgeCfg.Network.ServiceIPRangeEnd
         $newEdgeConfig.Init.ServiceIPRangeSize = ($endip.Split(".")[3]) - ($startip.Split(".")[3])
     }
+    #adding AioDeploy flag
+    $newEdgeConfig.AioDeploy = $true
     #arc section
     $newEdgeConfig | Add-Member -MemberType NoteProperty -Name 'Arc' -Value $arcdata -Force
     #network section
@@ -914,10 +916,7 @@ function Invoke-AideDeployment {
     Write-Verbose "$aksedgeDeployParams"
     Write-Host "Starting AksEdge VM deployment..."
     $retval = New-AksEdgeDeployment -JsonConfigString $aksedgeDeployParams
-    
-    if ($retval -ieq "Azure Arc parameters not set or invalid") {
-        $retval = "OK"
-    }
+
     if ($retval -ieq "OK") {
         Write-Host "* AksEdge VM deployment successfull." -ForegroundColor Green
     } else {