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 71bc8af..f4e1f26 100644
--- a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/neutron_conf.pp
+++ b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/neutron_conf.pp
@@ -21,10 +21,10 @@ class virtual_accelerator::neutron_conf inherits virtual_accelerator {
 
       service { 'openvswitch-switch':
          ensure => 'running',
-         notify => Service['neutron-plugin-openvswitch-agent'],
+         notify => Service['neutron-openvswitch-agent'],
       }
 
-      service { 'neutron-plugin-openvswitch-agent':
+      service { 'neutron-openvswitch-agent':
          ensure => 'running',
       }
   }
diff --git a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp
index 6402616..b863169 100644
--- a/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp
+++ b/deployment_scripts/puppet/modules/virtual_accelerator/manifests/service.pp
@@ -25,11 +25,17 @@ class virtual_accelerator::service inherits virtual_accelerator {
 
   service { 'openvswitch-switch':
       ensure => 'running',
-      notify => Service['neutron-plugin-openvswitch-agent'],
+      notify => Service['neutron-openvswitch-agent'],
   }
 
-  service { 'neutron-plugin-openvswitch-agent':
+  service { 'neutron-openvswitch-agent':
       ensure => 'running',
+  }
+
+  # Let's make sure to use the default hugetlbfs mount point (that could have
+  # been modified by Fuel)
+  exec { 'disable_custom_hugepages_dir_qemu':
+      command => "sed -i 's~^hugetlbfs_mount =~#hugetlbfs_mount =~' /etc/libvirt/qemu.conf",
       notify => Service['libvirt-bin'],
   }
 
diff --git a/metadata.yaml b/metadata.yaml
index 3c2ecfc..04f0533 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -6,11 +6,11 @@ name: 6wind-virtual-accelerator
 # Human-readable name for your plugin
 title: 6WIND Virtual Accelerator Fuel plugin
 # Plugin version
-version: '2.0.1'
+version: '3.0.0'
 # Description
 description: Enable use of 6WIND Virtual Accelerator plugin for Neutron
 # Required Fuel version
-fuel_version: ['7.0', '8.0']
+fuel_version: ['9.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
@@ -24,11 +24,11 @@ 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