diff --git a/components/compliance-service/smokin/Gemfile b/components/compliance-service/smokin/Gemfile
index f969fdd26b..552745c88f 100644
--- a/components/compliance-service/smokin/Gemfile
+++ b/components/compliance-service/smokin/Gemfile
@@ -3,6 +3,6 @@ source "https://rubygems.org"
 
 
 gem "test-kitchen"
-gem "berkshelf"
+gem "berkshelf", ">= 7.0.10"
 gem "kitchen-vagrant"
 gem "rack", "= 2.2.8.1"
\ No newline at end of file
diff --git a/components/compliance-service/smokin/Gemfile.lock b/components/compliance-service/smokin/Gemfile.lock
index 21ebbb05de..95bd5d8d8c 100644
--- a/components/compliance-service/smokin/Gemfile.lock
+++ b/components/compliance-service/smokin/Gemfile.lock
@@ -1,174 +1,286 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bcrypt_pbkdf (1.0.1)
-    berkshelf (7.0.9)
-      chef (>= 13.6.52)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1119.0)
+    aws-sdk-core (3.226.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.105.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.190.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-secretsmanager (1.116.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.3.0)
+    bcrypt_pbkdf (1.1.1)
+    berkshelf (8.0.9)
+      chef (>= 15.7.32)
       chef-config
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       minitar (>= 0.6)
-      mixlib-archive (>= 0.4, < 2.0)
+      mixlib-archive (>= 1.1.4, < 2.0)
       mixlib-config (>= 2.2.5)
       mixlib-shellout (>= 2.0, < 4.0)
       octokit (~> 4.0)
       retryable (>= 2.0, < 4.0)
       solve (~> 4.0)
       thor (>= 0.20)
-    builder (3.2.4)
-    chef (15.7.32)
+    builder (3.3.0)
+    chef (17.10.122)
       addressable
-      bcrypt_pbkdf (~> 1.0)
-      bundler (>= 1.10)
-      chef-config (= 15.7.32)
-      chef-utils (= 15.7.32)
+      aws-sdk-s3 (~> 1.91)
+      aws-sdk-secretsmanager (~> 1.46)
+      chef-config (= 17.10.122)
+      chef-utils (= 17.10.122)
+      chef-vault
       chef-zero (>= 14.0.11)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      ed25519 (~> 1.2)
+      corefoundation (~> 0.3.4)
+      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
-      ffi (~> 1.9, >= 1.9.25)
-      ffi-libarchive
-      ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 2)
+      ffi (~> 1.15.5)
+      ffi-libarchive (~> 1.0, >= 1.0.3)
+      ffi-yajl (>= 2.2, < 4.0)
       iniparse (~> 1.4)
-      license-acceptance (~> 1.0, >= 1.0.5)
+      inspec-core (~> 5.22.36)
+      license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.0.3, < 4.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 4.2, < 6)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 15.0)
+      mixlib-shellout (>= 3.1.1, < 4.0)
+      net-sftp (>= 2.1.2, < 5.0)
+      ohai (~> 17.0)
       plist (~> 3.2)
-      proxifier (~> 1.0)
+      proxifier2 (~> 1.1)
       syslog-logger (~> 1.6)
-      train-core (~> 3.1)
+      train-core (~> 3.10)
       train-winrm (>= 0.2.5)
-      tty-screen (~> 0.6)
-      uuidtools (~> 2.1.5)
-    chef-config (15.7.32)
+      uuidtools (>= 2.1.5, < 3.0)
+      vault (~> 0.16)
+    chef-config (17.10.122)
       addressable
-      chef-utils (= 15.7.32)
+      chef-utils (= 17.10.122)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-utils (15.7.32)
-    chef-zero (14.0.17)
+    chef-telemetry (1.1.1)
+      chef-config
+      concurrent-ruby (~> 1.0)
+    chef-utils (17.10.122)
+      concurrent-ruby
+    chef-vault (4.1.11)
+    chef-zero (15.0.11)
       ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 4.0)
+      hashie (>= 2.0, < 5.0)
       mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
+      webrick
     cleanroom (1.0.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    ed25519 (1.2.4)
-    equatable (0.6.1)
-    erubi (1.9.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.5)
+    cookstyle (8.1.4)
+      rubocop (= 1.75.8)
+    corefoundation (0.3.13)
+      ffi (>= 1.15.0)
+    diff-lcs (1.5.1)
+    ed25519 (1.3.0)
+    erubi (1.13.1)
     erubis (2.7.0)
-    faraday (1.0.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
-    ffi-libarchive (1.0.0)
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
+    ffi (1.15.5)
+    ffi-libarchive (1.1.14)
       ffi (~> 1.0)
-    ffi-yajl (2.3.3)
-      libyajl2 (~> 1.2)
+    ffi-yajl (2.6.0)
+      libyajl2 (>= 1.2)
     fuzzyurl (0.9.0)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
-    hashie (3.6.0)
-    highline (1.7.10)
-    httpclient (2.8.3)
-    iniparse (1.4.4)
+      rexml (~> 3.0)
+    hashie (4.1.0)
+    httpclient (2.9.0)
+      mutex_m
+    iniparse (1.5.0)
+    inspec-core (5.22.55)
+      addressable (~> 2.4)
+      chef-telemetry (~> 1.0, >= 1.0.8)
+      cookstyle
+      faraday (>= 1, < 3)
+      faraday-follow_redirects (~> 0.3)
+      hashie (>= 3.4, < 6.0)
+      license-acceptance (>= 0.2.13, < 3.0)
+      method_source (>= 0.8, < 2.0)
+      mixlib-log (~> 3.0)
+      multipart-post (~> 2.0)
+      parallel (~> 1.9)
+      parslet (>= 1.5, < 3.0)
+      pry (~> 0.13)
+      rspec (>= 3.9, <= 3.12)
+      rspec-its (~> 1.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      semverse (~> 3.0)
+      sslshake (~> 1.2)
+      thor (>= 0.20, < 1.3.0)
+      tomlrb (>= 1.2, < 2.1)
+      train-core (~> 3.10)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
     ipaddress (0.8.3)
-    json (2.3.0)
+    jmespath (1.6.2)
+    json (2.12.2)
     kitchen-vagrant (1.6.1)
       test-kitchen (>= 1.4, < 3)
-    libyajl2 (1.2.0)
-    license-acceptance (1.0.13)
+    language_server-protocol (3.17.0.5)
+    libyajl2 (2.1.0)
+    license-acceptance (1.0.19)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
       tty-prompt (~> 0.18)
+    lint_roller (1.1.0)
     little-plugger (1.1.4)
-    logging (2.2.2)
+    logger (1.7.0)
+    logging (2.4.0)
       little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    minitar (0.9)
-    mixlib-archive (1.0.5)
+      multi_json (~> 1.14)
+    method_source (1.1.0)
+    minitar (0.12.1)
+    mixlib-archive (1.1.7)
       mixlib-log
-    mixlib-authentication (3.0.6)
-    mixlib-cli (2.1.5)
-    mixlib-config (3.0.6)
+    mixlib-authentication (3.0.10)
+    mixlib-cli (2.1.8)
+    mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.11.26)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (3.0.8)
-    mixlib-shellout (3.0.9)
+    mixlib-log (3.1.2.1)
+      ffi (< 1.17.0)
+    mixlib-shellout (3.3.8)
+      chef-utils
     mixlib-versioning (1.2.12)
-    molinillo (0.6.6)
-    multi_json (1.14.1)
-    multipart-post (2.1.1)
-    necromancer (0.5.1)
+    molinillo (0.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
     net-ssh (5.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
-    net-ssh-multi (1.2.1)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
-    octokit (4.16.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (15.7.4)
-      chef-config (>= 12.8, < 16)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    ohai (17.9.4)
+      chef-config (>= 14.12, < 18)
+      chef-utils (>= 16.0, < 18)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
       mixlib-config (>= 2.0, < 4.0)
       mixlib-log (>= 2.0.1, < 4.0)
-      mixlib-shellout (>= 2.0, < 4.0)
+      mixlib-shellout (~> 3.2, >= 3.2.5)
       plist (~> 3.1)
-      systemu (~> 2.6.4)
+      train-core
       wmi-lite (~> 1.0)
-    pastel (0.7.3)
-      equatable (~> 0.6)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    parslet (2.0.0)
+    pastel (0.8.0)
       tty-color (~> 0.5)
-    plist (3.5.0)
-    proxifier (1.0.3)
-    public_suffix (4.0.6)
+    plist (3.7.2)
+    prism (1.4.0)
+    proxifier2 (1.1.0)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.1.1)
+    racc (1.8.1)
     rack (2.2.8.1)
+    rainbow (3.1.1)
+    regexp_parser (2.10.0)
     retryable (3.0.5)
-    rubyntlm (0.6.2)
-    rubyzip (2.2.0)
-    sawyer (0.8.2)
+    rexml (3.4.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.3)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-its (1.3.1)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.12.7)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.2)
+    rubocop (1.75.8)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    rubyntlm (0.6.5)
+      base64
+    rubyzip (2.4.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    semverse (3.0.0)
-    solve (4.0.3)
+      faraday (>= 0.17.3, < 3)
+    semverse (3.0.2)
+    solve (4.0.4)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    strings (0.1.8)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
+    sslshake (1.3.1)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     syslog-logger (1.6.8)
-    systemu (2.6.5)
     test-kitchen (2.3.4)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
@@ -183,34 +295,42 @@ GEM
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
     thor (0.20.3)
-    tomlrb (1.2.9)
-    train-core (3.2.14)
+    tomlrb (1.3.0)
+    train-core (3.12.13)
+      addressable (~> 2.5)
+      ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.2, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    tty-box (0.5.0)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
       tty-cursor (~> 0.7)
-    tty-color (0.5.1)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.20.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.7.1)
-    unicode-display_width (1.6.1)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.2)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
+    unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    uuidtools (2.1.5)
-    winrm (2.3.4)
+    uuidtools (2.2.0)
+    vault (0.18.2)
+      aws-sigv4
+    webrick (1.9.1)
+    winrm (2.3.6)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
@@ -218,27 +338,27 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
     winrm-elevated (1.2.0)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.4)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
       winrm (~> 2.0)
     wisper (2.0.1)
-    wmi-lite (1.0.5)
+    wmi-lite (1.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf
+  berkshelf (>= 7.0.10)
   kitchen-vagrant
   rack (= 2.2.8.1)
   test-kitchen
 
 BUNDLED WITH
-   1.17.2
+   1.17.3