diff --git a/.gitignore b/.gitignore
index 381f09e..56b8c89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 .idea
 .venv
 .build
+*.rpm
+*.deb
diff --git a/fuel_plugin_example/LICENSE b/fuel_plugin_example_v1/LICENSE
similarity index 100%
rename from fuel_plugin_example/LICENSE
rename to fuel_plugin_example_v1/LICENSE
diff --git a/fuel_plugin_example/README.md b/fuel_plugin_example_v1/README.md
similarity index 100%
rename from fuel_plugin_example/README.md
rename to fuel_plugin_example_v1/README.md
diff --git a/fuel_plugin_example/deployment_scripts/deploy.sh b/fuel_plugin_example_v1/deployment_scripts/deploy.sh
similarity index 98%
rename from fuel_plugin_example/deployment_scripts/deploy.sh
rename to fuel_plugin_example_v1/deployment_scripts/deploy.sh
index c2f4d9c..cada54e 100755
--- a/fuel_plugin_example/deployment_scripts/deploy.sh
+++ b/fuel_plugin_example_v1/deployment_scripts/deploy.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eux
 
 # It's a script which deploys your plugin
 echo fuel_plugin_example > /tmp/fuel_plugin_example
diff --git a/fuel_plugin_example/environment_config.yaml b/fuel_plugin_example_v1/environment_config.yaml
similarity index 100%
rename from fuel_plugin_example/environment_config.yaml
rename to fuel_plugin_example_v1/environment_config.yaml
diff --git a/fuel_plugin_example/fuel-simple-service.py b/fuel_plugin_example_v1/fuel-simple-service.py
similarity index 100%
rename from fuel_plugin_example/fuel-simple-service.py
rename to fuel_plugin_example_v1/fuel-simple-service.py
diff --git a/fuel_plugin_example/metadata.yaml b/fuel_plugin_example_v1/metadata.yaml
similarity index 100%
rename from fuel_plugin_example/metadata.yaml
rename to fuel_plugin_example_v1/metadata.yaml
diff --git a/fuel_plugin_example/pre_build_hook b/fuel_plugin_example_v1/pre_build_hook
similarity index 98%
rename from fuel_plugin_example/pre_build_hook
rename to fuel_plugin_example_v1/pre_build_hook
index d8130a9..3530308 100755
--- a/fuel_plugin_example/pre_build_hook
+++ b/fuel_plugin_example_v1/pre_build_hook
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+set -eux
 
 command -v fpm >/dev/null 2>&1 || {
     echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1;
diff --git a/fuel_plugin_example/repositories/centos/.gitkeep b/fuel_plugin_example_v1/repositories/centos/.gitkeep
similarity index 100%
rename from fuel_plugin_example/repositories/centos/.gitkeep
rename to fuel_plugin_example_v1/repositories/centos/.gitkeep
diff --git a/fuel_plugin_example/repositories/ubuntu/.gitkeep b/fuel_plugin_example_v1/repositories/ubuntu/.gitkeep
similarity index 100%
rename from fuel_plugin_example/repositories/ubuntu/.gitkeep
rename to fuel_plugin_example_v1/repositories/ubuntu/.gitkeep
diff --git a/fuel_plugin_example/tasks.yaml b/fuel_plugin_example_v1/tasks.yaml
similarity index 100%
rename from fuel_plugin_example/tasks.yaml
rename to fuel_plugin_example_v1/tasks.yaml
diff --git a/fuel_plugin_example_v2/.gitignore b/fuel_plugin_example_v2/.gitignore
new file mode 100644
index 0000000..daedd39
--- /dev/null
+++ b/fuel_plugin_example_v2/.gitignore
@@ -0,0 +1,3 @@
+.tox
+.build
+*.pyc
diff --git a/fuel_plugin_example_v2/LICENSE b/fuel_plugin_example_v2/LICENSE
new file mode 100644
index 0000000..e06d208
--- /dev/null
+++ b/fuel_plugin_example_v2/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/fuel_plugin_example_v2/README.md b/fuel_plugin_example_v2/README.md
new file mode 100644
index 0000000..51d213c
--- /dev/null
+++ b/fuel_plugin_example_v2/README.md
@@ -0,0 +1,4 @@
+fuel_plugin_example
+===================
+
+Plugin description
\ No newline at end of file
diff --git a/fuel_plugin_example_v2/deployment_scripts/deploy.sh b/fuel_plugin_example_v2/deployment_scripts/deploy.sh
new file mode 100755
index 0000000..cada54e
--- /dev/null
+++ b/fuel_plugin_example_v2/deployment_scripts/deploy.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eux
+
+# It's a script which deploys your plugin
+echo fuel_plugin_example > /tmp/fuel_plugin_example
+
+OS_NAME=''
+if   grep -i CentOS /etc/issue.net >/dev/null; then
+    OS_NAME='centos';
+elif grep -i Ubuntu /etc/issue.net >/dev/null; then
+    OS_NAME='ubuntu';
+fi
+
+function install_package {
+    if [ $OS_NAME == 'ubuntu' ]; then
+        apt-get install -y fuel-simple-service
+    elif [ $OS_NAME == 'centos' ]; then
+        yum install -y fuel-simple-service
+    fi
+}
+
+install_package
+fuel-simple-service.py &
diff --git a/fuel_plugin_example_v2/environment_config.yaml b/fuel_plugin_example_v2/environment_config.yaml
new file mode 100644
index 0000000..0857e0e
--- /dev/null
+++ b/fuel_plugin_example_v2/environment_config.yaml
@@ -0,0 +1,7 @@
+attributes:
+  fuel_plugin_example:
+    value: 'Set default value'
+    label: 'Text field'
+    description: 'Description for text field'
+    weight: 25
+    type: "text"
diff --git a/fuel_plugin_example_v2/fuel-simple-service.py b/fuel_plugin_example_v2/fuel-simple-service.py
new file mode 100755
index 0000000..247a2d6
--- /dev/null
+++ b/fuel_plugin_example_v2/fuel-simple-service.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from wsgiref.simple_server import make_server
+
+def web_app(environ, start_response):
+    status = '200 OK'
+    headers = [('Content-type', 'text/plain')]
+
+    start_response(status, headers)
+
+    return open('/etc/astute.yaml').read()
+
+
+def start_server(host, port):
+    httpd = make_server(host, port, web_app)
+    print 'Started server 8234'
+    httpd.serve_forever()
+
+
+def main():
+    start_server('', 8234)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/fuel_plugin_example_v2/metadata.yaml b/fuel_plugin_example_v2/metadata.yaml
new file mode 100644
index 0000000..a0dac25
--- /dev/null
+++ b/fuel_plugin_example_v2/metadata.yaml
@@ -0,0 +1,32 @@
+# Plugin name
+name: fuel_plugin_example
+# Human-readable name for your plugin
+title: Title for fuel_plugin_example plugin
+# Plugin version
+version: '2.0.0'
+# Description
+description: Enable to use plugin X for Neutron
+# Required fuel version
+fuel_version: ['6.1']
+# Specify license of your plugin
+licenses: ['Apache License Version 2.0']
+# Specify author or company name
+authors: ['Specify author or company name']
+# A link to the plugin's page
+homepage: 'https://github.com/stackforge/fuel-plugins'
+
+# The plugin is compatible with releases in the list
+releases:
+  - os: ubuntu
+    version: 2014.2-6.1
+    mode: ['ha', 'multinode']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/ubuntu
+  - os: centos
+    version: 2014.2-6.1
+    mode: ['ha', 'multinode']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/centos
+
+# Version of plugin package
+package_version: '2.0.0'
diff --git a/fuel_plugin_example_v2/pre_build_hook b/fuel_plugin_example_v2/pre_build_hook
new file mode 100755
index 0000000..66c39b0
--- /dev/null
+++ b/fuel_plugin_example_v2/pre_build_hook
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -eux
+
+command -v fpm >/dev/null 2>&1 || {
+    echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1;
+}
+
+ROOT=$(dirname `readlink -f $0`)
+
+UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu
+CENTOS_REPO_PATH=$ROOT/repositories/centos
+
+rm -f $UBUNTU_REPO_PATH/*.deb
+rm -f $CENTOS_REPO_PATH/*.rpm
+
+fpm -t deb -p $UBUNTU_REPO_PATH -n fuel-simple-service -v 2.0.0 -s dir $ROOT/fuel-simple-service.py=/usr/bin/fuel-simple-service.py
+fpm -t rpm -p $CENTOS_REPO_PATH -n fuel-simple-service -v 2.0.0 -s dir $ROOT/fuel-simple-service.py=/usr/bin/fuel-simple-service.py
diff --git a/fuel_plugin_example_v2/repositories/centos/.gitkeep b/fuel_plugin_example_v2/repositories/centos/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/fuel_plugin_example_v2/repositories/ubuntu/.gitkeep b/fuel_plugin_example_v2/repositories/ubuntu/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/fuel_plugin_example_v2/tasks.yaml b/fuel_plugin_example_v2/tasks.yaml
new file mode 100644
index 0000000..041be14
--- /dev/null
+++ b/fuel_plugin_example_v2/tasks.yaml
@@ -0,0 +1,20 @@
+# This tasks will be applied on controller nodes
+- role: ['primary-controller', 'controller']
+  stage: post_deployment
+  type: shell
+  parameters:
+    cmd: ./deploy.sh
+    timeout: 42
+# Task is applied for all roles
+- role: '*'
+  stage: pre_deployment
+  type: shell
+  parameters:
+    cmd: echo all > /tmp/plugin.all
+    timeout: 42
+# "reboot" task reboots the nodes and waits until they get back online
+# - role: '*'
+#   stage: pre_deployment
+#   type: reboot
+#   parameters:
+#     timeout: 600
diff --git a/fuel_plugin_example_v2_update/.gitignore b/fuel_plugin_example_v2_update/.gitignore
new file mode 100644
index 0000000..daedd39
--- /dev/null
+++ b/fuel_plugin_example_v2_update/.gitignore
@@ -0,0 +1,3 @@
+.tox
+.build
+*.pyc
diff --git a/fuel_plugin_example_v2_update/LICENSE b/fuel_plugin_example_v2_update/LICENSE
new file mode 100644
index 0000000..e06d208
--- /dev/null
+++ b/fuel_plugin_example_v2_update/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/fuel_plugin_example_v2_update/README.md b/fuel_plugin_example_v2_update/README.md
new file mode 100644
index 0000000..51d213c
--- /dev/null
+++ b/fuel_plugin_example_v2_update/README.md
@@ -0,0 +1,4 @@
+fuel_plugin_example
+===================
+
+Plugin description
\ No newline at end of file
diff --git a/fuel_plugin_example_v2_update/deployment_scripts/deploy.sh b/fuel_plugin_example_v2_update/deployment_scripts/deploy.sh
new file mode 100755
index 0000000..cada54e
--- /dev/null
+++ b/fuel_plugin_example_v2_update/deployment_scripts/deploy.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eux
+
+# It's a script which deploys your plugin
+echo fuel_plugin_example > /tmp/fuel_plugin_example
+
+OS_NAME=''
+if   grep -i CentOS /etc/issue.net >/dev/null; then
+    OS_NAME='centos';
+elif grep -i Ubuntu /etc/issue.net >/dev/null; then
+    OS_NAME='ubuntu';
+fi
+
+function install_package {
+    if [ $OS_NAME == 'ubuntu' ]; then
+        apt-get install -y fuel-simple-service
+    elif [ $OS_NAME == 'centos' ]; then
+        yum install -y fuel-simple-service
+    fi
+}
+
+install_package
+fuel-simple-service.py &
diff --git a/fuel_plugin_example_v2_update/environment_config.yaml b/fuel_plugin_example_v2_update/environment_config.yaml
new file mode 100644
index 0000000..0857e0e
--- /dev/null
+++ b/fuel_plugin_example_v2_update/environment_config.yaml
@@ -0,0 +1,7 @@
+attributes:
+  fuel_plugin_example:
+    value: 'Set default value'
+    label: 'Text field'
+    description: 'Description for text field'
+    weight: 25
+    type: "text"
diff --git a/fuel_plugin_example_v2_update/fuel-simple-service.py b/fuel_plugin_example_v2_update/fuel-simple-service.py
new file mode 100755
index 0000000..247a2d6
--- /dev/null
+++ b/fuel_plugin_example_v2_update/fuel-simple-service.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from wsgiref.simple_server import make_server
+
+def web_app(environ, start_response):
+    status = '200 OK'
+    headers = [('Content-type', 'text/plain')]
+
+    start_response(status, headers)
+
+    return open('/etc/astute.yaml').read()
+
+
+def start_server(host, port):
+    httpd = make_server(host, port, web_app)
+    print 'Started server 8234'
+    httpd.serve_forever()
+
+
+def main():
+    start_server('', 8234)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/fuel_plugin_example_v2_update/metadata.yaml b/fuel_plugin_example_v2_update/metadata.yaml
new file mode 100644
index 0000000..3669c44
--- /dev/null
+++ b/fuel_plugin_example_v2_update/metadata.yaml
@@ -0,0 +1,32 @@
+# Plugin name
+name: fuel_plugin_example
+# Human-readable name for your plugin
+title: Title for fuel_plugin_example plugin
+# Plugin version
+version: '2.0.2'
+# Description
+description: Enable to use plugin X for Neutron
+# Required fuel version
+fuel_version: ['6.1']
+# Specify license of your plugin
+licenses: ['Apache License Version 2.0']
+# Specify author or company name
+authors: ['Specify author or company name']
+# A link to the plugin's page
+homepage: 'https://github.com/stackforge/fuel-plugins'
+
+# The plugin is compatible with releases in the list
+releases:
+  - os: ubuntu
+    version: 2014.2-6.1
+    mode: ['ha', 'multinode']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/ubuntu
+  - os: centos
+    version: 2014.2-6.1
+    mode: ['ha', 'multinode']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/centos
+
+# Version of plugin package
+package_version: '2.0.0'
diff --git a/fuel_plugin_example_v2_update/pre_build_hook b/fuel_plugin_example_v2_update/pre_build_hook
new file mode 100755
index 0000000..fa8c169
--- /dev/null
+++ b/fuel_plugin_example_v2_update/pre_build_hook
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -eux
+
+command -v fpm >/dev/null 2>&1 || {
+    echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1;
+}
+
+ROOT=$(dirname `readlink -f $0`)
+
+UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu
+CENTOS_REPO_PATH=$ROOT/repositories/centos
+
+rm -f $UBUNTU_REPO_PATH/*.deb
+rm -f $CENTOS_REPO_PATH/*.rpm
+
+fpm -t deb -p $UBUNTU_REPO_PATH -n fuel-simple-service -v 2.0.2 -s dir $ROOT/fuel-simple-service.py=/usr/bin/fuel-simple-service.py
+fpm -t rpm -p $CENTOS_REPO_PATH -n fuel-simple-service -v 2.0.2 -s dir $ROOT/fuel-simple-service.py=/usr/bin/fuel-simple-service.py
diff --git a/fuel_plugin_example_v2_update/repositories/centos/.gitkeep b/fuel_plugin_example_v2_update/repositories/centos/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/fuel_plugin_example_v2_update/repositories/ubuntu/.gitkeep b/fuel_plugin_example_v2_update/repositories/ubuntu/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/fuel_plugin_example_v2_update/tasks.yaml b/fuel_plugin_example_v2_update/tasks.yaml
new file mode 100644
index 0000000..041be14
--- /dev/null
+++ b/fuel_plugin_example_v2_update/tasks.yaml
@@ -0,0 +1,20 @@
+# This tasks will be applied on controller nodes
+- role: ['primary-controller', 'controller']
+  stage: post_deployment
+  type: shell
+  parameters:
+    cmd: ./deploy.sh
+    timeout: 42
+# Task is applied for all roles
+- role: '*'
+  stage: pre_deployment
+  type: shell
+  parameters:
+    cmd: echo all > /tmp/plugin.all
+    timeout: 42
+# "reboot" task reboots the nodes and waits until they get back online
+# - role: '*'
+#   stage: pre_deployment
+#   type: reboot
+#   parameters:
+#     timeout: 600
diff --git a/run_tests.sh b/run_tests.sh
index 7590500..419a7c9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -128,6 +128,7 @@ function run_build {
 
   mkdir -p $BUILT_PLUGINS_PATH
   rm -f $BUILT_PLUGINS_PATH/*.fp
+  rm -f $BUILT_PLUGINS_PATH/*.rpm
 
   # Find plugins
   for dir in $ROOT/*/metadata.yaml;
@@ -136,6 +137,7 @@ function run_build {
     pushd "${plugin_dir}"
     fpb --build "${plugin_dir}" --debug || return 1
     cp *.fp $BUILT_PLUGINS_PATH/
+    cp *.rpm $BUILT_PLUGINS_PATH/
     popd
   done