diff --git a/README.md b/README.md
index 88e9aa0..7fcfb9c 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ A deployment guide is available from the Fortinet Document Library:
 * [Azure Application Insights requirement](docs/azure_application_insights.md)
 ## Launch a demo
 
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Ffortinet%2Ffortigate-autoscale-azure%2F3.6.0-dev%2Ftemplates%2Fdeploy_fortigate_autoscale.hybrid_licensing.json" target="_blank"><img src="http://azuredeploy.net/deploybutton.png"/></a>
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Ffortinet%2Ffortigate-autoscale-azure%2F3.6.0%2Ftemplates%2Fdeploy_fortigate_autoscale.hybrid_licensing.json" target="_blank"><img src="http://azuredeploy.net/deploybutton.png"/></a>
 
 # Support
 
diff --git a/package-lock.json b/package-lock.json
index 4e32b2a..4ae5a2f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "fortigate-autoscale-azure",
-  "version": "3.6.0-dev",
+  "version": "3.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "fortigate-autoscale-azure",
-      "version": "3.6.0-dev",
+      "version": "3.6.0",
       "license": "MIT",
       "dependencies": {
         "@azure/arm-compute": "^15.0.0",
diff --git a/package.json b/package.json
index 7479b4d..aa00f5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fortigate-autoscale-azure",
-  "version": "3.6.0-dev",
+  "version": "3.6.0",
   "description": "Fortinet FortiGate Autoscale for Azure",
   "main": "dist/transpiled/index.js",
   "types": "dist/types/index.d.ts",
diff --git a/templates/deploy_fortigate_autoscale.hybrid_licensing.json b/templates/deploy_fortigate_autoscale.hybrid_licensing.json
index e61e14a..b779bc1 100644
--- a/templates/deploy_fortigate_autoscale.hybrid_licensing.json
+++ b/templates/deploy_fortigate_autoscale.hybrid_licensing.json
@@ -242,7 +242,7 @@
         },
         "PackageResURL": {
             "type": "String",
-            "defaultValue": "https://github.com/fortinet/fortigate-autoscale-azure/releases/download/3.6.0-dev/fortigate-autoscale-azure-funcapp.zip",
+            "defaultValue": "https://github.com/fortinet/fortigate-autoscale-azure/releases/download/3.6.0/fortigate-autoscale-azure-funcapp.zip",
             "metadata": {
                 "description": "Public URL of the Autoscale Function App source file fortigate-autoscale-azure-funcapp.zip. This URL must be accessible by Azure. The default value points to the source file available in the release assets of the GitHub repo fortinet/fortigate-autoscale-azure."
             }
@@ -616,7 +616,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.database.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.database.json"
                 },
                 "parameters": {
                     "DatabaseAccountName": {
@@ -647,7 +647,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.vnet.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.vnet.json"
                 },
                 "parameters": {
                     "Subnets": {
@@ -675,7 +675,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.vnet.configuration.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.vnet.configuration.json"
                 },
                 "parameters": {
                     "NetworkSecurityGroupRulesSubnet1Inbound": {
@@ -715,7 +715,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.load_balancer.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.load_balancer.json"
                 },
                 "parameters": {
                     "ExternalLBBackendPoolNames": {
@@ -762,7 +762,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.faz_integration.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.faz_integration.json"
                 },
                 "parameters": {
                     "AdminPassword": {
@@ -808,7 +808,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.function_app.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.function_app.json"
                 },
                 "parameters": {
                     "FunctionAppName": {
@@ -845,7 +845,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.vmss.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.vmss.json"
                 },
                 "parameters": {
                     "AdminPassword": {
@@ -956,7 +956,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.database.access_restriction.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.database.access_restriction.json"
                 },
                 "parameters": {
                     "AllowAccessFromSubnetIds": {
@@ -987,7 +987,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.function_app.setup.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.function_app.setup.json"
                 },
                 "parameters": {
                     "AdminPortNumber": {
@@ -1149,7 +1149,7 @@
         },
         "deploymentPackageVersion": {
             "type": "string",
-            "value": "3.6.0-dev"
+            "value": "3.6.0"
         },
         "externalLBInboundNatPortRanges": {
             "type": "Array",
diff --git a/templates/link_template.function_app.setup.json b/templates/link_template.function_app.setup.json
index 732d408..b57334c 100644
--- a/templates/link_template.function_app.setup.json
+++ b/templates/link_template.function_app.setup.json
@@ -130,7 +130,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.function_app.configuration.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.function_app.configuration.json"
                 },
                 "parameters": {
                     "AdminPortNumber": {
@@ -263,7 +263,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/link_template.function_app.access_restriction.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/link_template.function_app.access_restriction.json"
                 },
                 "parameters": {
                     "AllowAccessFromIPAddresses": {
diff --git a/templates/link_template.vnet.configuration.json b/templates/link_template.vnet.configuration.json
index 2a4ed4b..6014f0f 100644
--- a/templates/link_template.vnet.configuration.json
+++ b/templates/link_template.vnet.configuration.json
@@ -80,7 +80,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/template_function.join_string_array.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/template_function.join_string_array.json"
                 },
                 "parameters": {
                     "InputString": {
diff --git a/templates/link_template.vnet.json b/templates/link_template.vnet.json
index f4d7da5..e292cfd 100644
--- a/templates/link_template.vnet.json
+++ b/templates/link_template.vnet.json
@@ -79,7 +79,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/template_function.join_string_array.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/template_function.join_string_array.json"
                 },
                 "parameters": {
                     "InputString": {
diff --git a/templates/template_function.join_string_array.json b/templates/template_function.join_string_array.json
index 865f8d8..e338aa5 100644
--- a/templates/template_function.join_string_array.json
+++ b/templates/template_function.join_string_array.json
@@ -32,7 +32,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0-dev/templates/template_function.join_string_array.json"
+                    "uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.6.0/templates/template_function.join_string_array.json"
                 },
                 "parameters": {
                     "InputString": {