diff --git a/cli/src/pcluster/constants.py b/cli/src/pcluster/constants.py
index 5c12f5b462..3c9c002d62 100644
--- a/cli/src/pcluster/constants.py
+++ b/cli/src/pcluster/constants.py
@@ -133,7 +133,7 @@
     "parallelcluster": "3.11.0",
     "cookbook": "aws-parallelcluster-cookbook-3.11.0",
     "chef": "18.4.12",
-    "berkshelf": "8.0.7",
+    "berkshelf": "8.0.9",
     "ami": "dev",
 }
 
diff --git a/cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml b/cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml
index 7a9e1897ed..b2487b43f5 100644
--- a/cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml
+++ b/cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml
@@ -8,7 +8,7 @@ constants:
       value: 18.4.12
   - BerkshelfVersion:
       type: string
-      value: 8.0.7
+      value: 8.0.9
   - FailExitCode:
       type: string
       value: 1
@@ -220,12 +220,12 @@ phases:
                 mkdir -p /opt/cinc/embedded/ssl/certs
                 ln -sf ${!CA_CERTS_FILE} /opt/cinc/embedded/ssl/certs/cacert.pem
               fi
-              
+
               curl --retry 3 -L -o gems.tgz https://${AWS::Region}-aws-parallelcluster.s3.${AWS::Region}.${AWS::URLSuffix}/archives/dependencies/ruby/gems.tgz
               tar -xf gems.tgz
-              
-              cd vendor/cache
 
+              cd vendor/cache
+              /opt/cinc/embedded/bin/gem install --no-document minitar:0.8
               /opt/cinc/embedded/bin/gem install --local --no-document berkshelf:{{ BerkshelfVersion }}
 
       # Download and vendor Cookbook
@@ -236,7 +236,7 @@ phases:
             - |
               set -v
               mkdir -p /etc/chef && sudo chown -R root:root /etc/chef
-              
+
               curl --retry 3 -L -o /etc/chef/aws-parallelcluster-cookbook.tgz "{{ build.CookbookUrl.outputs.stdout }}"
 
               mkdir -p /tmp/cookbooks