diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 8a35136..5802df7 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -32,6 +32,7 @@
     - openstack-haproxy-swift
     - openstack-haproxy-neutron
     - openstack-haproxy-mysqld
+    - openstack-haproxy-aodh
     - openstack-haproxy
     - ssl-keys-saving
     - ssl-add-trust-chain
@@ -70,21 +71,35 @@
     - openstack-haproxy-swift
     - openstack-haproxy-neutron
     - openstack-haproxy-mysqld
+    - openstack-haproxy-aodh
     - openstack-haproxy
     - ssl-keys-saving
     - ssl-add-trust-chain
 
 - id: standalone-haproxy-hiera
+  version: 2.0.0
   type: puppet
-  role: '*'
-  requires: [pre_hiera_config]
-  required_for: [pre_deployment_end]
+  groups: ['/.*/']
+  requires: [hiera]
+  required_for: [standalone-haproxy-hiera-update]
   parameters:
     puppet_manifest: puppet/manifests/add_to_hiera.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
 
+- id: standalone-haproxy-hiera-update
+  version: 2.0.0
+  type: puppet
+  groups: ['/.*/']
+  requires: [standalone-haproxy-hiera]
+  required_for: [globals]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 360
+
 - id: standalone-haproxy-mysqld-status
+  version: 2.0.0
   type: puppet
   groups: [primary-standalone-haproxy, standalone-haproxy]
   requires: [deploy_start, cluster-haproxy]
diff --git a/metadata.yaml b/metadata.yaml
index 2274622..ea5cf2f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,8 +1,8 @@
 name: detach_haproxy
 title: Separate Haproxy from Controller
-version: 1.1.0
+version: 2.0.0
 description: Adds new role for separate Haproxy deployment
-fuel_version: ['8.0']
+fuel_version: ['9.0']
 licenses: ['Apache License, Version 2.0']
 authors:
   - 'Aleksandr Didenko <adidenko@mirantis.com>'
@@ -10,14 +10,14 @@ homepage: 'https://github.com/adidenko/fuel-plugin-detach-haproxy'
 groups: ['network']
 releases:
   - os: ubuntu
-    version: liberty-8.0
+    version: mitaka-9.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
   - os: centos
-    version: liberty-8.0
+    version: mitaka-9.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/centos
-package_version: '3.0.0'
+package_version: '4.0.0'
 is_hotpluggable: false