diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 91d36660a0..54041ad029 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -130,7 +130,12 @@
     builders:
       - shell: |
           mkdir -p .cookbooks
-          ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
+          grep -E .*berkshelf.*3\.\d*\.\d*.* Gemfile
+          if [ $? -eq 0 ]; then
+            ruby1.9.1 /usr/bin/bundle exec berks vendor .cookbooks
+          else
+            ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
+          fi
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if [ -z $COOKBOOK ]; then
               echo "Cookbook name not defined in metadata.rb"