diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js
index 279c19ca8d..5b58c498ac 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js
@@ -185,7 +185,7 @@ define(function(require) {
       '<div class="row">' +
         '<div class="large-12 columns">' +
           '<input type="radio" class="hybridRadio" name="hybrid' + htmlId + '" value="ec2" id="amazonRadio' + htmlId + '"><label for="amazonRadio' + htmlId + '">Amazon EC2</label>' +
-          '<input type="radio" class="hybridRadio" name="hybrid' + htmlId + '" value="AZURE" id="azureRadio' + htmlId + '"><label for="azureRadio' + htmlId + '">Microsoft Azure</label>' +
+          '<input type="radio" class="hybridRadio" name="hybrid' + htmlId + '" value="azure" id="azureRadio' + htmlId + '"><label for="azureRadio' + htmlId + '">Microsoft Azure</label>' +
           oneInput +
           '<input type="radio" class="hybridRadio" name="hybrid' + htmlId + '" value="custom" id="customRadio' + htmlId + '"><label for="customRadio' + htmlId + '">' + Locale.tr("Custom") + '</label>' +
         '</div>' +
@@ -237,7 +237,7 @@ define(function(require) {
           $("#HOST", providerSection).append("<option value="+value.ID+">"+value.NAME+"</option>");
         });
         $("#HOST", providerSection)
-      } else if (this.value == "AZURE"){
+      } else if (this.value == "azure"){
         $(".hybrid_inputs", providerSection).append(AzureHTML());
       } else if (this.value == "opennebula"){
         $(".hybrid_inputs", providerSection).append(OpenNebulaHTML());
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/azure.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/azure.hbs
index ec54e2be52..cbdea2a827 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/azure.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/azure.hbs
@@ -1,11 +1,4 @@
 <div class="row">
-  <div class="medium-6 columns">
-    <label>
-      {{tr "Image"}}
-      {{{tip (tr "Specifies the base OS of the VM.")}}}
-      <input required wizard_field="IMAGE" type="text">
-    </label>
-  </div>
   <div class="medium-6 columns">
     <label>
       {{tr "Instance type"}}
@@ -13,13 +6,43 @@
       <input required wizard_field="INSTANCE_TYPE" type="text">
     </label>
   </div>
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Location"}}
+      {{{tip (tr "Azure datacenter where the VM will be sent.")}}}
+      <input required wizard_field="LOCATION" type="text">
+    </label>
+  </div>
 </div>
 <div class="row">
   <div class="medium-6 columns">
     <label>
-      {{tr "Location"}}
-      {{{tip (tr "Azure datacenter where the VM will be sent. See /etc/one/az_driver.conf for possible values (under region_name)")}}}
-      <input required wizard_field="LOCATION" type="text">
+      {{tr "Image offer"}}
+      {{{tip (tr "Specifies the OS image offer of the VM.")}}}
+      <input required wizard_field="IMAGE_OFFER" type="text">
+    </label>
+  </div>
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Image publisher"}}
+      {{{tip (tr "Specifies the image publisher.")}}}
+      <input required wizard_field="IMAGE_PUBLISHER" type="text">
+    </label>
+  </div>
+</div>
+<div class="row">
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Image SKU"}}
+      {{{tip (tr "Specifies the image SKU (stock keeping unit).")}}}
+      <input required wizard_field="IMAGE_SKU" type="text">
+    </label>
+  </div>
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Image version"}}
+      {{{tip (tr "Specifies the image version.")}}}
+      <input required wizard_field="IMAGE_VERSION" type="text">
     </label>
   </div>
 </div>
@@ -39,74 +62,80 @@
     </label>
   </div>
 </div>
-<br/>
 <div class="row">
-  <div class="medium-6 columns">
-    <label>
-      {{tr "Affinity group"}}
-      {{{tip (tr "Affinity groups allow you to group your Azure services to optimize performance. All services and VMs within an affinity group will be located in the same region")}}}
-      <input wizard_field="AFFINITY_GROUP" type="text">
-    </label>
-  </div>
-  <div class="medium-6 columns">
-    <label>
-      {{tr "Availability set"}}
-      <input wizard_field="AVAILABILITY_SET" type="text">
-    </label>
-  </div>
-</div>
-<div class="row">
-  <div class="medium-6 columns">
-    <label>
-      {{tr "Cloud service"}}
-      {{{tip (tr "Specifies the name of the cloud service where this VM will be linked. Defaults to 'OpennebulaDefaultCloudServiceName'")}}}
-      <input wizard_field="CLOUD_SERVICE" type="text">
-    </label>
-  </div>
-  <div class="medium-6 columns">
-    <label>
-      {{tr "SSH port"}}
-      {{{tip (tr "Port where the VMs ssh server will listen on")}}}
-      <input wizard_field="SSHPORT" type="text">
-    </label>
-  </div>
-</div>
-<div class="row">
-  <div class="medium-6 columns">
-    <label>
-      {{tr "Storage account"}}
-      <input wizard_field="STORAGE_ACCOUNT" type="text">
-    </label>
-  </div>
-  <div class="medium-6 columns">
-    <label>
-      {{tr "Subnet name"}}
-      {{{tip (tr "Name of the particular Subnet where this VM will be connected to")}}}
-      <input wizard_field="SUBNET" type="text">
-    </label>
-  </div>
-</div>
-<div class="row">
-  <div class="medium-6 columns">
-    <label>
-      {{tr "TCP endpoints"}}
-      {{{tip (tr "Comma-separated list of TCP ports to be accessible from the public internet to this VM")}}}
-      <input wizard_field="TCP_ENDPOINTS" type="text">
-    </label>
-  </div>
   <div class="medium-6 columns">
     <label>
       {{tr "Virtual Network name"}}
+      {{{tip (tr "Name of the virtual network, which is already created in Azure. If not given virtual network will be created based on VNET_* attributes below or using defaults.")}}}
       <input wizard_field="VIRTUAL_NETWORK_NAME" type="text">
     </label>
   </div>
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Public IP"}}
+      {{{tip (tr "Whether to assgin public IP to the VM")}}}
+      <select wizard_field="PUBLIC_IP" id="PUBLIC_IP" name="PUBLIC_IP">
+        <option value="YES">yes</option>
+        <option value="NO">no</option>
+      </select>
+    </label>
+  </div>
 </div>
 <div class="row">
   <div class="medium-6 columns">
     <label>
-      {{tr "Win RM"}}
-      {{{tip (tr "Comma-separated list of possible protocols to access this Windows VM")}}}
-      <input wizard_field="WIN_RM" type="text">
+      {{tr "VNET name"}}
+      {{{tip (tr "Name of virtual network which will be created on Azure. Default: one-vnet")}}}
+      <input wizard_field="VNET_NAME" type="text">
     </label>
   </div>
-</div>
\ No newline at end of file
+  <div class="medium-6 columns">
+    <label>
+      {{tr "VNET addr prefix"}}
+      {{{tip (tr "Vnet address prefix on. Default: 10.0.0.0/16.")}}}
+      <input wizard_field="VNET_ADDR_PREFIX" type="text">
+    </label>
+  </div>
+</div>
+<div class="row">
+  <div class="medium-6 columns">
+    <label>
+      {{tr "VNET dns"}}
+      {{{tip (tr "DNS server. Default: 8.8.8.8.")}}}
+      <input wizard_field="VNET_DNS" type="text">
+    </label>
+  </div>
+  <div class="medium-6 columns">
+    <label>
+      {{tr "VNET subname"}}
+      {{{tip (tr "Subnet name. Default: default.")}}}
+      <input wizard_field="VNET_SUBNAME" type="text">
+    </label>
+  </div>
+</div>
+<div class="row">
+  <div class="medium-6 columns">
+    <label>
+      {{tr "VNET sub prefix"}}
+      {{{tip (tr "Vnet subnet prefix. Default: 10.0.0.0/24.")}}}
+      <input wizard_field="VNET_SUB_PREFIX" type="text">
+    </label>
+  </div>
+</div>
+<div class="row">
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Availability set"}}
+      {{{tip (tr "Name of the availability set to which this VM will belong.")}}}
+      <input wizard_field="AVAILABILITY_SET" type="text">
+    </label>
+  </div>
+  <div class="medium-6 columns">
+    <label>
+      {{tr "Proximity group"}}
+      {{{tip (tr "Name of proximity groups which is already created in Azure. Proximity groups allow you to group your Azure services to optimize performance. All services and VMs within an affinity group will be located in the same region belong.")}}}
+      <input wizard_field="PROXIMITY_GROUP" type="text">
+    </label>
+  </div>
+</div>
+<br/>