diff --git a/Sitecore 8.2.1/xp/azuredeploy.json b/Sitecore 8.2.1/xp/azuredeploy.json
index 3b787698..9baa76ad 100644
--- a/Sitecore 8.2.1/xp/azuredeploy.json	
+++ b/Sitecore 8.2.1/xp/azuredeploy.json	
@@ -286,7 +286,7 @@
     },
     "cm.hostingplan.skuname": {
       "type": "string",
-      "defaultValue": "S1"
+      "defaultValue": "B2"
     },
     "cm.hostingplan.skucapacity": {
       "type": "int",
@@ -294,7 +294,7 @@
     },
     "cd.hostingplan.skuname": {
       "type": "string",
-      "defaultValue": "S1"
+      "defaultValue": "B2"
     },
     "cd.hostingplan.skucapacity": {
       "type": "int",
@@ -302,7 +302,7 @@
     },
     "prc.hostingplan.skuname": {
       "type": "string",
-      "defaultValue": "S1"
+      "defaultValue": "B1"
     },
     "prc.hostingplan.skucapacity": {
       "type": "int",
@@ -310,7 +310,7 @@
     },
     "rep.hostingplan.skuname": {
       "type": "string",
-      "defaultValue": "S1"
+      "defaultValue": "B1"
     },
     "rep.hostingplan.skucapacity": {
       "type": "int",
@@ -334,7 +334,7 @@
     },
     "sqldatabase.maxsize": {
       "type": "string",
-      "defaultValue": "10737418240"
+      "defaultValue": "268435456000"
     },
     "sqldatabase.serviceobjectivelevel": {
       "type": "string",
@@ -350,7 +350,7 @@
     },
     "rediscache.skuname": {
       "type": "string",
-      "defaultValue": "Basic"
+      "defaultValue": "Standard"
     },
     "rediscache.skufamily": {
       "type": "string",
@@ -358,7 +358,7 @@
     },
     "rediscache.skucapacity": {
       "type": "string",
-      "defaultValue": "0"
+      "defaultValue": "1"
     },
     "sitecoreTags": {
       "type": "object",
@@ -385,6 +385,265 @@
     "rep.authentication.apikey": {
       "type": "securestring",
       "minLength": 32
+    },
+    "sitecore.sku" : {
+      "type" : "string",
+      "defaultValue": "xP1",
+      "allowedValues": [
+        "xP1", "xP2", "xP3", "xP4", "xP5"
+      ],
+      "metadata": {
+        "description" : "Sitecore SKU controls the sizes and service levels of the provisioned resources"
+      }
+    },
+    "sitecore.skumap": {
+      "type" : "secureObject",
+      "defaultValue" : {
+        "xP1": {
+          "CmHostingPlan" : {
+            "SkuName" : "[parameters('cm.hostingplan.skuname')]",
+            "SkuCapacity" : "[parameters('cm.hostingplan.skucapacity')]"
+          },
+          "CdHostingPlan" : {
+            "SkuName" : "[parameters('cd.hostingplan.skuname')]",
+            "SkuCapacity" : "[parameters('cd.hostingplan.skucapacity')]"
+          },
+          "PrcHostingPlan" : {
+            "SkuName" : "[parameters('prc.hostingplan.skuname')]",
+            "SkuCapacity" : "[parameters('prc.hostingplan.skucapacity')]"
+          },
+          "RepHostingPlan" : {
+            "SkuName" : "[parameters('rep.hostingplan.skuname')]",
+            "SkuCapacity" : "[parameters('rep.hostingplan.skucapacity')]"
+          },
+          "CoreSqlDatabase" : {
+            "Edition": "[parameters('sqldatabase.edition')]",
+            "MaxSize": "[parameters('sqldatabase.maxsize')]",
+            "ServiceObjectiveLevel": "[parameters('sqldatabase.serviceobjectivelevel')]"
+          },
+          "MasterSqlDatabase" : {
+            "Edition": "[parameters('sqldatabase.edition')]",
+            "MaxSize": "[parameters('sqldatabase.maxsize')]",
+            "ServiceObjectiveLevel": "[parameters('sqldatabase.serviceobjectivelevel')]"
+          },
+          "WebSqlDatabase" : {
+            "Edition": "[parameters('sqldatabase.edition')]",
+            "MaxSize": "[parameters('sqldatabase.maxsize')]",
+            "ServiceObjectiveLevel": "[parameters('sqldatabase.serviceobjectivelevel')]"
+          },
+          "ReportingSqlDatabase" : {
+            "Edition": "[parameters('sqldatabase.edition')]",
+            "MaxSize": "[parameters('sqldatabase.maxsize')]",
+            "ServiceObjectiveLevel": "[parameters('sqldatabase.serviceobjectivelevel')]"
+          },
+          "Searchservice" : {
+            "SkuName": "[parameters('searchservice.skuname')]",
+            "Partitions" : "[parameters('searchservice.partitioncount')]",
+            "Replicas" : "[parameters('searchservice.replicacount')]"
+          },
+          "RedisCache" : {
+            "SkuName": "[parameters('rediscache.skuname')]",
+            "SkuFamily": "[parameters('rediscache.skufamily')]",
+            "SkuCapacity": "[int(parameters('rediscache.skucapacity'))]"
+          }
+        },
+        "xP2": {
+          "CmHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CdHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 2
+          },
+          "PrcHostingPlan" : {
+            "SkuName" : "B1",
+            "SkuCapacity" : 1
+          },
+          "RepHostingPlan" : {
+            "SkuName" : "B1",
+            "SkuCapacity" : 1
+          },
+          "CoreSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "MasterSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "WebSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "ReportingSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "Searchservice" : {
+            "SkuName": "Standard",
+            "Partitions" : 1,
+            "Replicas" : 1
+          },
+          "RedisCache" : {
+            "SkuName": "Standard",
+            "SkuFamily": "C",
+            "SkuCapacity": 1
+          }
+        },
+        "xP3": {
+          "CmHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CdHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 3
+          },
+          "PrcHostingPlan" : {
+            "SkuName" : "B1",
+            "SkuCapacity" : 1
+          },
+          "RepHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CoreSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "MasterSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "WebSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "ReportingSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S2"
+          },
+          "Searchservice" : {
+            "SkuName": "Standard",
+            "Partitions" : 1,
+            "Replicas" : 1
+          },
+          "RedisCache" : {
+            "SkuName": "Standard",
+            "SkuFamily": "C",
+            "SkuCapacity": 1
+          }
+        },
+        "xP4": {
+          "CmHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CdHostingPlan" : {
+            "SkuName" : "S3",
+            "SkuCapacity" : 4
+          },
+          "PrcHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "RepHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CoreSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "MasterSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "WebSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S2"
+          },
+          "ReportingSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S2"
+          },
+          "Searchservice" : {
+            "SkuName": "Standard",
+            "Partitions" : 1,
+            "Replicas" : 1
+          },
+          "RedisCache" : {
+            "SkuName": "Standard",
+            "SkuFamily": "C",
+            "SkuCapacity": 1
+          }
+        },
+        "xP5": {
+          "CmHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CdHostingPlan" : {
+            "SkuName" : "S3",
+            "SkuCapacity" : 8
+          },
+          "PrcHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "RepHostingPlan" : {
+            "SkuName" : "B2",
+            "SkuCapacity" : 1
+          },
+          "CoreSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "MasterSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S1"
+          },
+          "WebSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S3"
+          },
+          "ReportingSqlDatabase" : {
+            "Edition": "Standard",
+            "MaxSize": "268435456000",
+            "ServiceObjectiveLevel": "S2"
+          },
+          "Searchservice" : {
+            "SkuName": "Standard",
+            "Partitions" : 1,
+            "Replicas" : 1
+          },
+          "RedisCache" : {
+            "SkuName": "Standard",
+            "SkuFamily": "C",
+            "SkuCapacity": 1
+          }
+        }
+      }
+    },
+    "resourceSizes" : {
+      "type" :"object",
+      "defaultValue": "[parameters('sitecore.skumap')[parameters('sitecore.sku')]]"
     }
   },
   "resources": [
@@ -393,8 +652,8 @@
       "name": "[variables('cmHostingPlanNameTidy')]",
       "apiVersion": "[variables('webApiVersion')]",
       "sku": {
-        "name": "[parameters('cm.hostingplan.skuname')]",
-        "capacity": "[parameters('cm.hostingplan.skucapacity')]"
+        "name": "[parameters('resourceSizes').CmHostingPlan.SkuName]",
+        "capacity": "[parameters('resourceSizes').CmHostingPlan.SkuCapacity]"
       },
       "properties": {
         "name": "[variables('cmHostingPlanNameTidy')]"
@@ -409,8 +668,8 @@
       "name": "[variables('cdHostingPlanNameTidy')]",
       "apiVersion": "[variables('webApiVersion')]",
       "sku": {
-        "name": "[parameters('cd.hostingplan.skuname')]",
-        "capacity": "[parameters('cd.hostingplan.skucapacity')]"
+        "name": "[parameters('resourceSizes').CdHostingPlan.SkuName]",
+        "capacity": "[parameters('resourceSizes').CdHostingPlan.SkuCapacity]"
       },
       "properties": {
         "name": "[variables('cdHostingPlanNameTidy')]"
@@ -426,8 +685,8 @@
       "name": "[variables('prcHostingPlanNameTidy')]",
       "apiVersion": "[variables('webApiVersion')]",
       "sku": {
-        "name": "[parameters('prc.hostingplan.skuname')]",
-        "capacity": "[parameters('prc.hostingplan.skucapacity')]"
+        "name": "[parameters('resourceSizes').PrcHostingPlan.SkuName]",
+        "capacity": "[parameters('resourceSizes').PrcHostingPlan.SkuCapacity]"
       },
       "properties": {
         "name": "[variables('prcHostingPlanNameTidy')]"
@@ -443,8 +702,8 @@
       "name": "[variables('repHostingPlanNameTidy')]",
       "apiVersion": "[variables('webApiVersion')]",
       "sku": {
-        "name": "[parameters('rep.hostingplan.skuname')]",
-        "capacity": "[parameters('rep.hostingplan.skucapacity')]"
+        "name": "[parameters('resourceSizes').RepHostingPlan.SkuName]",
+        "capacity": "[parameters('resourceSizes').RepHostingPlan.SkuCapacity]"
       },
       "properties": {
         "name": "[variables('repHostingPlanNameTidy')]"
@@ -611,7 +870,7 @@
       },
       "location": "[parameters('location')]",
       "dependsOn": [
-        "[resourceId('Microsoft.Web/serverfarms', variables('prcHostingPlanNameTidy'))]",
+        "[resourceId('Microsoft.Web/serverfarms', variables('prcHostingPlanNameTidy'))]"
       ],
       "tags": {
         "provider": "[parameters('sitecoreTags').provider]"
@@ -688,7 +947,7 @@
       },
       "location": "[parameters('location')]",
       "dependsOn": [
-        "[resourceId('Microsoft.Web/serverfarms', variables('repHostingPlanNameTidy'))]",
+        "[resourceId('Microsoft.Web/serverfarms', variables('repHostingPlanNameTidy'))]"
       ],
       "tags": {
         "provider": "[parameters('sitecoreTags').provider]"
@@ -774,10 +1033,10 @@
           "type": "databases",
           "apiVersion": "[variables('dbApiVersion')]",
           "properties": {
-            "edition": "[parameters('sqldatabase.edition')]",
+            "edition": "[parameters('resourceSizes').CoreSqlDatabase.Edition]",
             "collation": "[parameters('sqldatabase.collation')]",
-            "maxSizeBytes": "[parameters('sqldatabase.maxsize')]",
-            "requestedServiceObjectiveName": "[parameters('sqldatabase.serviceobjectivelevel')]"
+            "maxSizeBytes": "[parameters('resourceSizes').CoreSqlDatabase.MaxSize]",
+            "requestedServiceObjectiveName": "[parameters('resourceSizes').CoreSqlDatabase.ServiceObjectiveLevel]"
           },
           "name": "[variables('coreDbNameTidy')]",
           "location": "[parameters('location')]",
@@ -790,10 +1049,10 @@
           "type": "databases",
           "apiVersion": "[variables('dbApiVersion')]",
           "properties": {
-            "edition": "[parameters('sqldatabase.edition')]",
+            "edition": "[parameters('resourceSizes').MasterSqlDatabase.Edition]",
             "collation": "[parameters('sqldatabase.collation')]",
-            "maxSizeBytes": "[parameters('sqldatabase.maxsize')]",
-            "requestedServiceObjectiveName": "[parameters('sqldatabase.serviceobjectivelevel')]"
+            "maxSizeBytes": "[parameters('resourceSizes').MasterSqlDatabase.MaxSize]",
+            "requestedServiceObjectiveName": "[parameters('resourceSizes').MasterSqlDatabase.ServiceObjectiveLevel]"
           },
           "name": "[variables('masterDbNameTidy')]",
           "location": "[parameters('location')]",
@@ -806,10 +1065,10 @@
           "type": "databases",
           "apiVersion": "[variables('dbApiVersion')]",
           "properties": {
-            "edition": "[parameters('sqldatabase.edition')]",
+            "edition": "[parameters('resourceSizes').ReportingSqlDatabase.Edition]",
             "collation": "[parameters('sqldatabase.collation')]",
-            "maxSizeBytes": "[parameters('sqldatabase.maxsize')]",
-            "requestedServiceObjectiveName": "[parameters('sqldatabase.serviceobjectivelevel')]"
+            "maxSizeBytes": "[parameters('resourceSizes').ReportingSqlDatabase.MaxSize]",
+            "requestedServiceObjectiveName": "[parameters('resourceSizes').ReportingSqlDatabase.ServiceObjectiveLevel]"
           },
           "name": "[variables('repDbNameTidy')]",
           "location": "[parameters('location')]",
@@ -849,10 +1108,10 @@
           "type": "databases",
           "apiVersion": "[variables('dbApiVersion')]",
           "properties": {
-            "edition": "[parameters('sqldatabase.edition')]",
+            "edition": "[parameters('resourceSizes').WebSqlDatabase.Edition]",
             "collation": "[parameters('sqldatabase.collation')]",
-            "maxSizeBytes": "[parameters('sqldatabase.maxsize')]",
-            "requestedServiceObjectiveName": "[parameters('sqldatabase.serviceobjectivelevel')]"
+            "maxSizeBytes": "[parameters('resourceSizes').WebSqlDatabase.MaxSize]",
+            "requestedServiceObjectiveName": "[parameters('resourceSizes').WebSqlDatabase.ServiceObjectiveLevel]"
           },
           "name": "[variables('webDbNameTidy')]",
           "location": "[parameters('location')]",
@@ -870,10 +1129,10 @@
       "location": "[parameters('location')]",
       "properties": {
         "sku": {
-          "name": "[toLower(parameters('searchservice.skuname'))]"
+          "name": "[toLower(parameters('resourceSizes').SearchService.SkuName)]"
         },
-        "replicaCount": "[parameters('searchservice.replicacount')]",
-        "partitionCount": "[parameters('searchservice.partitioncount')]"
+        "replicaCount": "[parameters('resourceSizes').SearchService.Replicas]",
+        "partitionCount": "[parameters('resourceSizes').SearchService.Partitions]"
       },
       "tags": {
         "provider": "[parameters('sitecoreTags').provider]"
@@ -886,9 +1145,9 @@
       "location": "[parameters('location')]",
       "properties": {
         "sku": {
-          "name": "[parameters('rediscache.skuname')]",
-          "family": "[parameters('rediscache.skufamily')]",
-          "capacity": "[parameters('rediscache.skucapacity')]"
+          "name": "[parameters('resourceSizes').RedisCache.SkuName]",
+          "family": "[parameters('resourceSizes').RedisCache.SkuFamily]",
+          "capacity": "[parameters('resourceSizes').RedisCache.SkuCapacity]"
         },
         "enableNonSslPort": false
       },
diff --git a/Sitecore 8.2.1/xp/azuredeploy.parameters.json b/Sitecore 8.2.1/xp/azuredeploy.parameters.json
index b48b106a..b728e53b 100644
--- a/Sitecore 8.2.1/xp/azuredeploy.parameters.json	
+++ b/Sitecore 8.2.1/xp/azuredeploy.parameters.json	
@@ -40,5 +40,8 @@
   },
   "licenseXml": {
     "value": ""
+  },
+  "sitecore.sku": {
+    "value": ""
   }
 }