diff --git a/.circleci/config.yml b/.circleci/config.yml
index c5cd9df..370fb3b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -187,6 +187,71 @@ commands:
           at: workspace
       - run: python .circleci/package_release.py
 
+  validate_version:
+    steps:
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule init
+            git submodule update --remote --recursive
+      - run:
+          name: Download pip
+          command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+      - run:
+          name: Install pip
+          command: sudo python get-pip.py
+      - run:
+          name: Install virtualenv
+          command: pip install --user virtualenv
+      - run:
+          name: Init virtualenv
+          command: virtualenv env
+      - run:
+          name: install tox
+          command: pip install --user pygithub pyyaml==3.10
+      - run:
+          name: upgrade setuptools
+          command: pip install --upgrade setuptools
+      - run:
+          name: install local project
+          command: pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip
+      - attach_workspace:
+          at: workspace
+      - run: ecosystem-test validate-plugin-version
+
+  validate_documentation:
+    steps:
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule init
+            git submodule update --remote --recursive
+      - run:
+          name: Download pip
+          command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+      - run:
+          name: Install pip
+          command: sudo python get-pip.py
+      - run:
+          name: Install virtualenv
+          command: pip install --user virtualenv
+      - run:
+          name: Init virtualenv
+          command: virtualenv env
+      - run:
+          name: install tox
+          command: pip install --user pygithub pyyaml==3.10
+      - run:
+          name: upgrade setuptools
+          command: pip install --upgrade setuptools
+      - run:
+          name: install local project
+          command: pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip
+      - attach_workspace:
+          at: workspace
+      - run: ecosystem-test validate-docs
+
+
   create_manager_container_505:
     steps:
       - run:
@@ -314,12 +379,26 @@ jobs:
       - checkout
       - release_plugin
 
+  validate_documentation:
+    executor: py36
+    steps:
+      - checkout
+      - validate_documentation
+
+  validate_version:
+    executor: py36
+    steps:
+      - checkout
+      - validate_version
+
 workflows:
   version: 2.1
   tests:
     jobs:
       - py3_compat
       - unittests_py36
+      - validate_documentation
+      - validate_version
       - wagon:
           filters:
             branches: