diff --git a/deployment_scripts/puppet/manifests/6wind_repo.pp b/deployment_scripts/puppet/manifests/6wind_repo.pp
index 6ecf79f..12ae953 100644
--- a/deployment_scripts/puppet/manifests/6wind_repo.pp
+++ b/deployment_scripts/puppet/manifests/6wind_repo.pp
@@ -5,7 +5,7 @@ notice('MODULAR: virtual_accelerator/6wind_repo.pp')
 
 $settings = hiera('6wind-virtual-accelerator', {})
 
-$va_version = "1.3"
+$va_version = $settings['va_version']
 
 $cred_package_content = $settings['credentials_package'][content]
 $cred_package_name = $settings['credentials_package'][name]
@@ -14,6 +14,12 @@ if $cred_package_name !~ /.+[.]deb[.]b64?/ {
   fail('The given credentials package has wrong format')
 }
 
+if $va_version !~ /1[.](\d+)/ {
+  if $va_version != 'stable' {
+    $va_version = 'stable'
+  }
+}
+
 file {"/tmp/${cred_package_name}":
   ensure => file,
   content => $cred_package_content,
diff --git a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/init.pp b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/init.pp
index 3bb70ff..2140ae1 100644
--- a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/init.pp
@@ -16,11 +16,14 @@ class virtual_accelerator {
   $va_conf_file = ''
   $disable_ipset = $settings['disable_ipset']
   $enable_host_cpu = $settings['enable_host_cpu']
+  $va_version = $settings['va_version']
 
   if $settings['va_conf_file'] {
     $va_conf_file = $settings['va_conf_file'][content]
   }
+
   if $settings['va_license_file'] {
     $va_license_file = $settings['va_license_file'][content]
   }
+
 }
diff --git a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/neutron_conf.pp b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/neutron_conf.pp
index d6d2f5a..71bc8af 100644
--- a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/neutron_conf.pp
+++ b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/neutron_conf.pp
@@ -6,18 +6,18 @@ class virtual_accelerator::neutron_conf inherits virtual_accelerator {
   $advanced_params = $virtual_accelerator::advanced_params
 
   $disable_ipset = $virtual_accelerator::disable_ipset
+  $va_version = $virtual_accelerator::va_version
 
-    if $disable_ipset == true {
+  if $disable_ipset == true or $va_version == '1.3' {
+      $OVS_CONF_FILE = "/etc/neutron/plugins/ml2/ml2_conf.ini"
 
-	  $OVS_CONF_FILE = "/etc/neutron/plugins/ml2/ml2_conf.ini"
-
-	  package { 'crudini':
-	      ensure => 'latest',
-	  } ->
-	  exec { 'disable_ipset':
-	     command => "crudini --set ${OVS_CONF_FILE} securitygroup enable_ipset False",
-	     notify => Service['openvswitch-switch'],
-	  }
+      package { 'crudini':
+         ensure => 'latest',
+      } ->
+      exec { 'disable_ipset':
+         command => "crudini --set ${OVS_CONF_FILE} securitygroup enable_ipset False",
+         notify => Service['openvswitch-switch'],
+      }
 
       service { 'openvswitch-switch':
          ensure => 'running',
diff --git a/doc/source/images/activation.png b/doc/source/images/activation.png
index 3ff78e6..c57a056 100644
Binary files a/doc/source/images/activation.png and b/doc/source/images/activation.png differ
diff --git a/doc/source/images/advanced.png b/doc/source/images/advanced.png
index 0b90a78..7f0a769 100644
Binary files a/doc/source/images/advanced.png and b/doc/source/images/advanced.png differ
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index dc3ac6c..1a35eeb 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -109,6 +109,11 @@ Configuring 6WIND Virtual Accelerator Plugin
     *   Provide the license file to be used for 6WIND Virtual Accelerator
         activation
 
+    *   Specify the 6WIND Virtual Accelerator version you want to install.
+        You can keep the 'stable' default value if you want the latest
+        version, otherwise specify an explicit value (eg. 1.3).
+        Remember to use **at least version 1.3** for Fuel 8.
+
     *   Refer to next chapter for the description of Advanced Paramaters fields.
 
 
diff --git a/environment_config.yaml b/environment_config.yaml
index 570c50d..9989d9d 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -14,6 +14,13 @@ attributes:
     weight: 30
     type: "file"
 
+  va_version:
+    value: 'stable'
+    label: 'Product branch'
+    description: 'defines the Virtual Accelerator version to be installed (in 1.x format)'
+    weight: 32
+    type: "text"
+
   advanced_params_enabled:
     value: false
     label: "Advanced Parameters"
@@ -72,7 +79,7 @@ attributes:
         action: hide
 
   disable_ipset:
-    value: true
+    value: false
     label: 'Disable neutron ipset'
     description: 'Set/unset support for ipset when using security groups'
     weight: 80