diff --git a/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json b/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json
index 1f88f755..c18748c3 100644
--- a/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json
+++ b/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json
@@ -95,8 +95,8 @@
             "name": "cloudGuardVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Version",
-            "defaultValue": "R81.20",
-            "toolTip": "Check Point Recommended version for all deployments is R81.20",
+            "defaultValue": "R82",
+            "toolTip": "Check Point Recommended version for all deployments is R82",
             "constraints": {
               "allowedValues": [
                 {
diff --git a/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json b/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json
index 88c2f5dd..003ef198 100644
--- a/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json
+++ b/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json
@@ -29,7 +29,7 @@
         "R82 - Pay As You Go (NGTP)",
         "R82 - Pay As You Go (NGTX)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R82 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/azure/templates/marketplace-ha/createUiDefinition.json b/azure/templates/marketplace-ha/createUiDefinition.json
index 23f32504..fa40e001 100644
--- a/azure/templates/marketplace-ha/createUiDefinition.json
+++ b/azure/templates/marketplace-ha/createUiDefinition.json
@@ -73,8 +73,8 @@
             "name": "cloudGuardVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Version",
-            "defaultValue": "R81.20",
-            "toolTip": "Check Point Recommended version for all deployments is R81.20",
+            "defaultValue": "R82",
+            "toolTip": "Check Point Recommended version for all deployments is R82",
             "constraints": {
               "allowedValues": [
                 {
diff --git a/azure/templates/marketplace-ha/mainTemplate.json b/azure/templates/marketplace-ha/mainTemplate.json
index 4ba33ad7..73769700 100644
--- a/azure/templates/marketplace-ha/mainTemplate.json
+++ b/azure/templates/marketplace-ha/mainTemplate.json
@@ -22,7 +22,7 @@
         "R82 - Pay As You Go (NGTP)",
         "R82 - Pay As You Go (NGTX)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R82 - Bring Your Own License",
       "metadata": {
         "description": "Check Point CloudGuard version"
       }
diff --git a/azure/templates/marketplace-management/createUiDefinition.json b/azure/templates/marketplace-management/createUiDefinition.json
index e9a14893..c7780974 100644
--- a/azure/templates/marketplace-management/createUiDefinition.json
+++ b/azure/templates/marketplace-management/createUiDefinition.json
@@ -73,8 +73,8 @@
             "name": "cloudGuardVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Version",
-            "defaultValue": "R81.20",
-            "toolTip": "Check Point Recommended version for all deployments is R81.20",
+            "defaultValue": "R82",
+            "toolTip": "Check Point Recommended version for all deployments is R82",
             "constraints": {
               "allowedValues": [
                 {
diff --git a/azure/templates/marketplace-management/mainTemplate.json b/azure/templates/marketplace-management/mainTemplate.json
index a9f1c9dd..45de8f5b 100644
--- a/azure/templates/marketplace-management/mainTemplate.json
+++ b/azure/templates/marketplace-management/mainTemplate.json
@@ -19,7 +19,7 @@
         "R82 - Bring Your Own License",
         "R82 - Pay As You Go (MGMT25)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R82 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/azure/templates/marketplace-mds/createUiDefinition.json b/azure/templates/marketplace-mds/createUiDefinition.json
index 25ee5e7b..607720cd 100644
--- a/azure/templates/marketplace-mds/createUiDefinition.json
+++ b/azure/templates/marketplace-mds/createUiDefinition.json
@@ -73,8 +73,8 @@
             "name": "cloudGuardVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Version",
-            "defaultValue": "R81.20",
-            "toolTip": "Check Point Recommended version for all deployments is R81.20",
+            "defaultValue": "R82",
+            "toolTip": "Check Point Recommended version for all deployments is R82",
             "constraints": {
               "allowedValues": [
                 {
diff --git a/azure/templates/marketplace-mds/mainTemplate.json b/azure/templates/marketplace-mds/mainTemplate.json
index e26adc9d..4d77dd86 100644
--- a/azure/templates/marketplace-mds/mainTemplate.json
+++ b/azure/templates/marketplace-mds/mainTemplate.json
@@ -16,7 +16,7 @@
         "R81.20 - Bring Your Own License",
         "R82 - Bring Your Own License"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R82 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/azure/templates/marketplace-single/createUiDefinition.json b/azure/templates/marketplace-single/createUiDefinition.json
index 8c31366f..e8e97e37 100644
--- a/azure/templates/marketplace-single/createUiDefinition.json
+++ b/azure/templates/marketplace-single/createUiDefinition.json
@@ -73,8 +73,8 @@
             "name": "cloudGuardVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Version",
-            "defaultValue": "R81.20",
-            "toolTip": "Check Point Recommended version for all deployments is R81.20",
+            "defaultValue": "R82",
+            "toolTip": "Check Point Recommended version for all deployments is R82",
             "constraints": {
               "allowedValues": [
                 {
diff --git a/azure/templates/marketplace-single/mainTemplate.json b/azure/templates/marketplace-single/mainTemplate.json
index 18e793bf..68f3aff6 100644
--- a/azure/templates/marketplace-single/mainTemplate.json
+++ b/azure/templates/marketplace-single/mainTemplate.json
@@ -29,7 +29,7 @@
         "R82 - Pay As You Go (NGTP)",
         "R82 - Pay As You Go (NGTX)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R82 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/azure/templates/marketplace-vmss/createUiDefinition.json b/azure/templates/marketplace-vmss/createUiDefinition.json
index 71638675..2dd112bc 100644
--- a/azure/templates/marketplace-vmss/createUiDefinition.json
+++ b/azure/templates/marketplace-vmss/createUiDefinition.json
@@ -116,8 +116,8 @@
             "name": "cloudGuardVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Version",
-            "defaultValue": "R81.20",
-            "toolTip": "Check Point Recommended version for all deployments is R81.20",
+            "defaultValue": "r82",
+            "toolTip": "Check Point Recommended version for all deployments is R82",
             "constraints": {
               "allowedValues": [
                 {
diff --git a/azure/templates/marketplace-vmss/mainTemplate.json b/azure/templates/marketplace-vmss/mainTemplate.json
index 869399e7..21a9f011 100644
--- a/azure/templates/marketplace-vmss/mainTemplate.json
+++ b/azure/templates/marketplace-vmss/mainTemplate.json
@@ -29,7 +29,7 @@
         "R82 - Pay As You Go (NGTP)",
         "R82 - Pay As You Go (NGTX)"
       ],
-      "defaultValue": "R81.20 - Bring Your Own License",
+      "defaultValue": "R82 - Bring Your Own License",
       "metadata": {
         "description": "Version of Check Point CloudGuard"
       }
diff --git a/azure/templates/vwan-managed-app/README.md b/azure/templates/vwan-managed-app/README.md
index 293238e2..25109d40 100644
--- a/azure/templates/vwan-managed-app/README.md
+++ b/azure/templates/vwan-managed-app/README.md
@@ -12,12 +12,12 @@ For Security Enforcement (NGTP) license:
 https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSkus/checkpoint?api-version=2023-05-01
 ```
 
-For Full Package (NGTX + S1C) license:
+For Full Package (NGTX and Smart-1 Cloud) license:
 ```
 https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSkus/checkpoint-ngtx?api-version=2023-05-01
 ```
 
-For Full Package Premium (NGTX + S1C++) license:
+For Full Package Premium (NGTX and Smart-1 Cloud Premium) license:
 ```
 https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSkus/checkpoint-premium?api-version=2023-05-01
 ```
diff --git a/azure/templates/vwan-managed-app/mainTemplate.json b/azure/templates/vwan-managed-app/mainTemplate.json
index 48ab4465..8c9952e6 100644
--- a/azure/templates/vwan-managed-app/mainTemplate.json
+++ b/azure/templates/vwan-managed-app/mainTemplate.json
@@ -16,14 +16,14 @@
             "defaultValue": "Security Enforcement (NGTP)",
             "allowedValues": [
                 "Security Enforcement (NGTP)",
-                "Full Package (NGTX + S1C)",
-                "Full Package Premium (NGTX + S1C++)"
+                "Full Package (NGTX and Smart1-Cloud)",
+                "Full Package Premium (NGTX and Smart1-Cloud Premium)"
             ],
             "type": "String",
             "metadata": {
                 "description": "License type of Check Point CloudGuard"
             }
-      },
+        },
         "imageVersion": {
             "defaultValue": "8120.900634.1641",
             "type": "String",
@@ -32,7 +32,7 @@
             }
         },
         "osVersion": {
-            "defaultValue": "R8120",
+            "defaultValue": "R82",
             "allowedValues": [
                 "R8110",
                 "R8120",
@@ -167,8 +167,8 @@
             "metadata": {
               "description": "Use public IP for ingress traffic"
             }
-          },
-          "createNewIPIngress": {
+        },
+        "createNewIPIngress": {
             "type": "string",
             "allowedValues": [
               "no",
@@ -178,18 +178,45 @@
             "metadata": {
               "description": "Create new public IP"
             }
-          },
-          "ipIngressExistingResourceId": {
+        },
+        "customLicenseType": {
+            "type": "string",
+            "defaultValue": "",
+            "allowedValues": [
+                "",
+                "ngtp",
+                "ngtx",
+                "premium"
+            ],
+            "metadata": {
+                "Description": "License type when using staged image"
+            }
+        }, 
+        "ipIngressExistingResourceId": {
             "type": "string",
             "metadata": {
               "description": "The resource id of the public IP"
             },
             "defaultValue": ""
-          },
-          "deploymentTime": {
-              "type": "string",
-              "defaultValue": "[utcNow()]"
-          }
+        },
+        "deploymentTime": {
+            "type": "string",
+            "defaultValue": "[utcNow()]"
+        },
+        "planProduct": {
+            "type": "string",
+            "defaultValue": "cp-vwan-managed-app",
+            "metadata": {
+                "description": "Use the following plan when deploying a custom template: cp-vwan-managed-app"
+            }
+        },
+        "planVersion": {
+            "type": "string",
+            "defaultValue": "1.0.22",
+            "metadata": {
+                "description": "Always deploy the latest available version of the managed application (e.g., 1.0.22) to ensure optimal performance and compatibility. For a complete list of available versions, refer to: https://support.checkpoint.com/results/sk/sk132192"
+            }
+        }
     },
     "variables": {
         "managedResourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('managedResourceGroupName'))]",
@@ -302,9 +329,9 @@
             "kind": "MarketPlace",
             "plan": {
                 "name": "vwan-app",
-                "product": "cp-vwan-managed-app",
+                "product": "[parameters('planProduct')]",
                 "publisher": "checkpoint",
-                "version": "1.0.22"
+                "version": "[parameters('planVersion')]"
             },
             "identity": {
                 "type": "UserAssigned",
@@ -384,6 +411,9 @@
                     "createNewIPIngress": {
                         "value": "[parameters('createNewIPIngress')]"
                     },
+                    "customLicenseType": {
+                        "value": "[parameters('customLicenseType')]"
+                    },
                     "ipIngressExistingResourceId": {
                         "value": "[parameters('ipIngressExistingResourceId')]"
                     },