diff --git a/deprecated/azure/templates/R8040-R81/ha-r8040-r81/mainTemplate.json b/deprecated/azure/templates/R8040-R81/ha-r8040-r81/mainTemplate.json
index 59952e87..b281ecef 100644
--- a/deprecated/azure/templates/R8040-R81/ha-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/R8040-R81/ha-r8040-r81/mainTemplate.json
@@ -17,7 +17,7 @@
         "R80.40 - Pay As You Go (NGTX)",
         "R81 - Bring Your Own License",
         "R81 - Pay As You Go (NGTP)",
-        "R81 - Pay As You Go (NGTX)",
+        "R81 - Pay As You Go (NGTX)"
       ],
       "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
@@ -361,7 +361,7 @@
       "R80.40 - Pay As You Go (NGTX)": "NGTX",
       "R81 - Bring Your Own License": "BYOL",
       "R81 - Pay As You Go (NGTP)": "NGTP",
-      "R81 - Pay As You Go (NGTX)": "NGTX",
+      "R81 - Pay As You Go (NGTX)": "NGTX"
     },
     "offer": "[variables('offers')[parameters('cloudGuardVersion')]]",
     "osVersions": {
@@ -370,7 +370,7 @@
       "R80.40 - Pay As You Go (NGTX)": "R8040",
       "R81 - Bring Your Own License": "R81",
       "R81 - Pay As You Go (NGTP)": "R81",
-      "R81 - Pay As You Go (NGTX)": "R81",
+      "R81 - Pay As You Go (NGTX)": "R81"
     },
     "osVersion": "[variables('osVersions')[parameters('cloudGuardVersion')]]",
     "SerialConsoleGeographies": {
diff --git a/deprecated/azure/templates/R8040-R81/mds-r8040-r81/mainTemplate.json b/deprecated/azure/templates/R8040-R81/mds-r8040-r81/mainTemplate.json
index c9800935..fc8ce67a 100644
--- a/deprecated/azure/templates/R8040-R81/mds-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/R8040-R81/mds-r8040-r81/mainTemplate.json
@@ -13,9 +13,9 @@
       "type": "string",
       "allowedValues": [
         "R80.40 - Bring Your Own License",
-        "R81 - Bring Your Own License",
+        "R81 - Bring Your Own License"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/deprecated/azure/templates/R8040-R81/mgmt-r840-r81/mainTemplate.json b/deprecated/azure/templates/R8040-R81/mgmt-r840-r81/mainTemplate.json
index 44f62298..72ecc81c 100644
--- a/deprecated/azure/templates/R8040-R81/mgmt-r840-r81/mainTemplate.json
+++ b/deprecated/azure/templates/R8040-R81/mgmt-r840-r81/mainTemplate.json
@@ -17,7 +17,7 @@
         "R81 - Bring Your Own License",
         "R81 - Pay As You Go (MGMT25)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
@@ -319,7 +319,7 @@
     "storageAccountType": "Standard_LRS",
     "diskSize100GB": 100,
     "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('diskSize100GB'))]",
-    "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', parameters('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'enableApi=\"', parameters('enableApi'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
+    "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', parameters('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
     "customData64": "[base64(variables('customData'))]",
     "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]",
     "imagePublisher": "checkpoint",
diff --git a/deprecated/azure/templates/R8040-R81/single-ipv6-r8040-r81/mainTemplate.json b/deprecated/azure/templates/R8040-R81/single-ipv6-r8040-r81/mainTemplate.json
index 2a322a31..ff6c87d4 100644
--- a/deprecated/azure/templates/R8040-R81/single-ipv6-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/R8040-R81/single-ipv6-r8040-r81/mainTemplate.json
@@ -19,7 +19,7 @@
         "R81 - Pay As You Go (NGTP)",
         "R81 - Pay As You Go (NGTX)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R81- Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/deprecated/azure/templates/R8040-R81/single-r8040-r81/mainTemplate.json b/deprecated/azure/templates/R8040-R81/single-r8040-r81/mainTemplate.json
index 911b8572..95563c19 100644
--- a/deprecated/azure/templates/R8040-R81/single-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/R8040-R81/single-r8040-r81/mainTemplate.json
@@ -24,9 +24,9 @@
         "R80.40 - Pay As You Go (NGTX)",
         "R81 - Bring Your Own License",
         "R81 - Pay As You Go (NGTP)",
-        "R81 - Pay As You Go (NGTX)",
+        "R81 - Pay As You Go (NGTX)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/deprecated/azure/templates/R8040-R81/vmss-r8040-r81/mainTemplate.json b/deprecated/azure/templates/R8040-R81/vmss-r8040-r81/mainTemplate.json
index b343976c..4a0efc1f 100644
--- a/deprecated/azure/templates/R8040-R81/vmss-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/R8040-R81/vmss-r8040-r81/mainTemplate.json
@@ -561,7 +561,7 @@
     "additionalDiskSizeGB": "[if(contains('R8040 R81', variables('osVersion')), 0, parameters('additionalDiskSizeGB'))]",
     "diskSizeGB": "[add(variables('additionalDiskSizeGB'), variables('diskSize100GB'))]",
     "enableFloatingIP": "[equals(parameters('floatingIP'), 'yes')]",
-    "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'customMetrics=\"', variables('customMetrics'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
+    "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'customMetrics=\"', variables('customMetrics'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
     "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]",
     "imagePublisher": "checkpoint",
     "imageReferenceBYOL": {
diff --git a/deprecated/azure/templates/stack-R8040-R81/stack-ha-r8040-r81/mainTemplate.json b/deprecated/azure/templates/stack-R8040-R81/stack-ha-r8040-r81/mainTemplate.json
index 0847143c..c776a882 100644
--- a/deprecated/azure/templates/stack-R8040-R81/stack-ha-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/stack-R8040-R81/stack-ha-r8040-r81/mainTemplate.json
@@ -17,7 +17,7 @@
         "R80.40 - Pay As You Go (NGTX)",
         "R81 - Bring Your Own License",
         "R81 - Pay As You Go (NGTP)",
-        "R81 - Pay As You Go (NGTX)",
+        "R81 - Pay As You Go (NGTX)"
       ],
       "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
diff --git a/deprecated/azure/templates/stack-R8040-R81/stack-management-r8040-r81/mainTemplate.json b/deprecated/azure/templates/stack-R8040-R81/stack-management-r8040-r81/mainTemplate.json
index d2e59edb..bbee571d 100644
--- a/deprecated/azure/templates/stack-R8040-R81/stack-management-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/stack-R8040-R81/stack-management-r8040-r81/mainTemplate.json
@@ -15,7 +15,7 @@
         "R80.40 - Bring Your Own License",
         "R80.40 - Pay As You Go (MGMT25)",
         "R81 - Bring Your Own License",
-        "R81 - Pay As You Go (MGMT25)",
+        "R81 - Pay As You Go (MGMT25)"
       ],
       "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
diff --git a/deprecated/azure/templates/stack-R8040-R81/stack-single-r8040-r81/mainTemplate.json b/deprecated/azure/templates/stack-R8040-R81/stack-single-r8040-r81/mainTemplate.json
index 50422c53..9155f14b 100644
--- a/deprecated/azure/templates/stack-R8040-R81/stack-single-r8040-r81/mainTemplate.json
+++ b/deprecated/azure/templates/stack-R8040-R81/stack-single-r8040-r81/mainTemplate.json
@@ -17,7 +17,7 @@
           "R80.40 - Pay As You Go (NGTX)",
           "R81 - Bring Your Own License",
           "R81 - Pay As You Go (NGTP)",
-          "R81 - Pay As You Go (NGTX)",
+          "R81 - Pay As You Go (NGTX)"
       ],
       "defaultValue": "R81 - Bring Your Own License",
       "metadata": {
@@ -238,7 +238,7 @@
       "R80.40 - Pay As You Go (NGTX)": "NGTX",
       "R81 - Bring Your Own License": "BYOL",
       "R81 - Pay As You Go (NGTP)": "NGTP",
-      "R81 - Pay As You Go (NGTX)": "NGTX",
+      "R81 - Pay As You Go (NGTX)": "NGTX"
     },
     "offer": "[variables('offers')[parameters('cloudGuardVersion')]]",
     "osVersions": {