diff --git a/README.md b/README.md
index c5e36db..44352be 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Requirements
 
 | Requirement                      | Version/Comment |
 |----------------------------------|-----------------|
-| Mirantis OpenStack compatibility | 8.0             |
+| Mirantis OpenStack compatibility | 9.0             |
 
 Recommendations
 ---------------
@@ -60,7 +60,7 @@ Openvswitch plugin installation
 
         id | name            | version | package_version
         ---|-----------------|---------|----------------
-        1  | fuel-plugin-ovs | 0.8.0   | 3.0.0
+        1  | fuel-plugin-ovs | 0.9.0   | 4.0.0
 
 8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
 
diff --git a/deployment_scripts/puppet/manifests/ovs-install-compute.pp b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
index b29deee..9b9301f 100644
--- a/deployment_scripts/puppet/manifests/ovs-install-compute.pp
+++ b/deployment_scripts/puppet/manifests/ovs-install-compute.pp
@@ -1,16 +1,21 @@
-$fuel_settings = parseyaml(file('/etc/compute.yaml'))
+$fuel_settings = parseyaml(file('/etc/astute.yaml'))
 if $operatingsystem == 'Ubuntu' {
-    if $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
-        $packages='openvswitch-datapath-dkms_2.4.90.dpdk-1 openvswitch-common_2.4.90.dpdk-1 openvswitch-switch_2.4.90.dpdk-1'
+    if $fuel_settings['fuel-plugin-ovs']['support_nsh'] and
+       $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
+        exec { 'install ovs/nsh-dpdk':
+            command => '/usr/bin/apt-get -y --force-yes install openvswitch-datapath-dkms_2.4.90.nshdpdk-1 openvswitch-common_2.4.90.nshdpdk-1 openvswitch-switch_2.4.90.nshdpdk-1'
+        }
     }
-    if $fuel_settings['fuel-plugin-ovs']['support_nsh'] {
-        $packages='openvswitch-datapath-dkms_2.4.90.nsh-1 openvswitch-common_2.4.90.nsh-1  openvswitch-switch_2.4.90.nsh-1'
+    elsif $fuel_settings['fuel-plugin-ovs']['support_dpdk'] {
+        exec { 'install ovs/dpdk':
+            command => '/usr/bin/apt-get -y --force-yes install openvswitch-datapath-dkms_2.4.90.dpdk-1 openvswitch-common_2.4.90.dpdk-1 openvswitch-switch_2.4.90.dpdk-1'
+        }
     }
-    if $fuel_settings['fuel-plugin-ovs']['support_nsh_dpdk'] {
-        $packages='openvswitch-datapath-dkms_2.4.90.nshdpdk-1 openvswitch-common_2.4.90.nshdpdk-1 openvswitch-switch_2.4.90.nshdpdk-1'
-    }
-    exec { 'ovs install':
-        command => '/usr/bin/apt-get -y --force-yes install $packages'
+    elsif $fuel_settings['fuel-plugin-ovs']['support_nsh'] {
+        exec { 'install ovs/nsh':
+            command => '/usr/bin/apt-get -y --force-yes install openvswitch-datapath-dkms_2.4.90.nsh-1 openvswitch-common_2.4.90.nsh-1  openvswitch-switch_2.4.90.nsh-1'
+        }
     }
+
 } elsif $operatingsystem == 'CentOS' {
 }
diff --git a/environment_config.yaml b/environment_config.yaml
index ac4b617..04a3fda 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -9,8 +9,3 @@ attributes:
       weight: 20
       value: false
       label: "support NSH"
-    support_nsh_dpdk:
-      type: "checkbox"
-      weight: 20
-      value: false
-      label: "support NSH & DPDK"
diff --git a/metadata.yaml b/metadata.yaml
index bec0dcb..b8f5edf 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,11 +3,11 @@ name: fuel-plugin-ovs
 # Human-readable name for your plugin
 title: Openvswitch with NSH/DPDK support
 # Plugin version
-version: '0.8.0'
+version: '0.9.0'
 # Description
-description: 'This plugin provides to deploy openvswitch with nsh'
+description: 'This plugin provides to deploy openvswitch with NSH/DPDK'
 # Required fuel version
-fuel_version: ['8.0']
+fuel_version: ['9.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
@@ -21,10 +21,12 @@ groups: ['network']
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: liberty-8.0
+    version: mitaka-9.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
 
 # Version of plugin package
-package_version: '3.0.0'
+package_version: '4.0.0'
+
+is_hotpluggable: false