diff --git a/.ruby-version b/.ruby-version
index a603bb50..fd2a0186 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.5
+3.1.0
diff --git a/.rubygems-version b/.rubygems-version
index e852534b..a0891f56 100644
--- a/.rubygems-version
+++ b/.rubygems-version
@@ -1 +1 @@
-3.2.33
+3.3.4
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..d34d678e
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "davidanson.vscode-markdownlint",
+    "elagil.pre-commit-helper",
+    "cschleiden.vscode-github-actions"
+  ]
+}
diff --git a/.vscode/sprout-wrap.code-workspace b/.vscode/sprout-wrap.code-workspace
new file mode 100644
index 00000000..64bfb872
--- /dev/null
+++ b/.vscode/sprout-wrap.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": ".."
+		}
+	],
+	"settings": {}
+}
diff --git a/Gemfile b/Gemfile
index 62de427c..be0f5d67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,4 +32,4 @@ group :development do
   gem 'fauxhai', '~> 6.0.0', require: false # versions after 6.0.1 remove `node['etc']`
 end
 
-gem 'chef-zero', '~> 13.1', require: false # versions after 14.x require ruby 2.4
+#gem 'chef-zero', '~> 13.1', require: false # versions after 14.x require ruby 2.4
diff --git a/Gemfile.lock b/Gemfile.lock
index 46071713..cc6cbb21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,62 +5,94 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     awesome_print (1.9.2)
+    bcrypt_pbkdf (1.1.0.rc1)
     builder (3.2.4)
     byebug (11.1.3)
-    chef (13.10.0)
+    chef (16.7.61)
       addressable
+      bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 13.10.0)
-      chef-zero (~> 13.0)
-      diff-lcs (~> 1.2, >= 1.2.4)
+      chef-config (= 16.7.61)
+      chef-utils (= 16.7.61)
+      chef-vault
+      chef-zero (>= 14.0.11)
+      diff-lcs (>= 1.2.4, < 1.4.0)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
+      ffi (>= 1.9.25)
+      ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
-      iso8601 (~> 0.9.1)
-      mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 2.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
+      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.1.1, < 4.0)
+      net-sftp (>= 2.1.2, < 4.0)
+      net-ssh (>= 4.2, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 13.0)
+      ohai (~> 16.0)
+      pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
       syslog-logger (~> 1.6)
+      train-core (~> 3.2, >= 3.2.28)
+      train-winrm (>= 0.2.5)
+      tty-prompt (~> 0.21)
+      tty-screen (~> 0.6)
+      tty-table (~> 0.11)
       uuidtools (~> 2.1.5)
-    chef-config (13.10.0)
+    chef-cli (5.6.1)
+      addressable (>= 2.3.5, < 2.9)
+      chef (>= 16.0)
+      cookbook-omnifetch (~> 0.5)
+      diff-lcs (>= 1.0, < 1.4)
+      ffi-yajl (>= 1.0, < 3.0)
+      license-acceptance (>= 1.0.11, < 3)
+      minitar (~> 0.6)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      pastel (~> 0.7)
+      solve (> 2.0, < 5.0)
+    chef-config (16.7.61)
       addressable
+      chef-utils (= 16.7.61)
       fuzzyurl
-      mixlib-config (>= 2.2.12, < 3.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-zero (13.1.0)
+    chef-utils (16.7.61)
+    chef-vault (4.1.10)
+    chef-zero (15.0.11)
       ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 1.3)
-      rack (~> 2.0)
+      hashie (>= 2.0, < 5.0)
+      mixlib-log (>= 2.0, < 4.0)
+      rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
-    chefspec (7.3.4)
-      chef (>= 12.16.42)
-      fauxhai (>= 4)
+      webrick
+    chefspec (9.3.3)
+      chef (>= 15)
+      chef-cli
+      fauxhai-ng (>= 7.5)
       rspec (~> 3.0)
     coderay (1.1.3)
+    cookbook-omnifetch (0.11.1)
+      mixlib-archive (>= 0.4, < 2.0)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
-    diff-lcs (1.5.0)
+    diff-lcs (1.3)
+    ed25519 (1.3.0)
+    erubi (1.10.0)
     erubis (2.7.0)
     fauxhai (6.0.1)
       net-ssh
+    fauxhai-ng (9.3.0)
+      net-ssh
     ffi (1.15.5)
+    ffi-libarchive (1.1.3)
+      ffi (~> 1.0)
     ffi-yajl (2.4.0)
       libyajl2 (>= 1.2)
     foodcritic (16.3.0)
@@ -72,6 +104,8 @@ GEM
       treetop (~> 1.4)
     formatador (0.3.0)
     fuzzyurl (0.9.0)
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -93,11 +127,15 @@ GEM
     guard-shell (0.7.2)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
+    gyoku (1.4.0)
+      builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashie (2.1.2)
-    highline (1.7.10)
+    highline (2.0.3)
+    httpclient (2.8.3)
     iniparse (1.5.0)
     ipaddress (0.8.3)
-    iso8601 (0.9.1)
+    json (2.6.1)
     librarian (0.1.2)
       highline
       thor (~> 0.15)
@@ -106,34 +144,44 @@ GEM
       librarian (~> 0.1.0)
       minitar (>= 0.5.2)
     libyajl2 (2.1.0)
+    license-acceptance (2.1.13)
+      pastel (~> 0.7)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    little-plugger (1.1.4)
+    logging (2.3.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
     lumberjack (1.2.8)
     method_source (1.0.0)
     mini_portile2 (2.7.1)
     minitar (0.9)
-    mixlib-archive (0.4.20)
+    mixlib-archive (1.1.7)
       mixlib-log
-    mixlib-authentication (1.4.2)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.18)
+    mixlib-authentication (3.0.10)
+    mixlib-cli (2.1.8)
+    mixlib-config (3.0.9)
       tomlrb
-    mixlib-log (1.7.1)
-    mixlib-shellout (2.4.4)
+    mixlib-log (3.0.9)
+    mixlib-shellout (3.2.7)
+      chef-utils
+    molinillo (0.8.0)
     multi_json (1.15.0)
     nenv (0.3.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
+    net-ssh (6.1.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)
-    net-telnet (0.1.1)
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
@@ -143,24 +191,28 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
+    nori (2.6.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    ohai (13.12.6)
-      chef-config (>= 12.5.0.alpha.1, < 14)
+    ohai (16.17.0)
+      chef-config (>= 14.12, < 17)
+      chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
-      mixlib-cli (< 2.0)
-      mixlib-config (~> 2.0)
-      mixlib-log (>= 1.7.1, < 2.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-cli (>= 1.7.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (~> 3.2, >= 3.2.5)
       plist (~> 3.1)
-      systemu (~> 2.6.4)
+      train-core
       wmi-lite (~> 1.0)
-    parallel (1.21.0)
+    parallel (1.22.1)
     parser (3.1.0.0)
       ast (~> 2.4.1)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     plist (3.6.0)
     polyglot (0.3.5)
     proxifier (1.0.3)
@@ -173,7 +225,7 @@ GEM
     pry-coolline (0.2.6)
       coolline (~> 0.5)
       pry (~> 0.13)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.3)
     rainbow (3.1.1)
@@ -183,25 +235,19 @@ GEM
       ffi (~> 1.0)
     regexp_parser (2.2.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -214,13 +260,10 @@ GEM
     rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.2)
     rufus-lru (1.1.0)
-    serverspec (2.41.8)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
+    semverse (3.0.0)
     shellany (0.0.1)
     soloist (1.0.3)
       awesome_print
@@ -229,32 +272,84 @@ GEM
       librarian-chef
       net-ssh
       thor
-    specinfra (2.83.1)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
+    solve (4.0.4)
+      molinillo (~> 0.6)
+      semverse (>= 1.1, < 4.0)
+    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)
     thor (0.20.3)
     tomlrb (1.3.0)
+    train-core (3.9.2)
+      addressable (~> 2.5)
+      ffi (!= 1.13.0)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
+    train-winrm (0.2.13)
+      winrm (>= 2.3.6, < 3.0)
+      winrm-elevated (~> 1.2.2)
+      winrm-fs (~> 1.0)
     treetop (1.6.11)
       polyglot (~> 0.3)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-cursor (~> 0.7)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    wmi-lite (1.0.5)
+    webrick (1.7.0)
+    winrm (2.3.6)
+      builder (>= 2.1.2)
+      erubi (~> 1.8)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    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.7)
 
 PLATFORMS
   arm64-darwin-21
   ruby
   universal-darwin-20
+  x86_64-darwin-18
   x86_64-darwin-19
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
   bundler
-  chef-zero (~> 13.1)
   chefspec
   fauxhai (~> 6.0.0)
   ffi (>= 1.15.2)
diff --git a/soloistrc.E0000001104.yml b/soloistrc.E0000001104.yml
index 3f787d21..7191f305 100644
--- a/soloistrc.E0000001104.yml
+++ b/soloistrc.E0000001104.yml
@@ -370,6 +370,7 @@ node_attributes:
   vim_alias_vi_to_minimal_vim: false
   versions:
     rvm: 1.26.11
+    bash_it: master
   rvm:
     user_installs:
       - user: jcuzella
diff --git a/soloistrc.lyra.yml b/soloistrc.lyra.yml
index 5a8db3ad..8ef7180a 100644
--- a/soloistrc.lyra.yml
+++ b/soloistrc.lyra.yml
@@ -260,9 +260,9 @@ node_attributes:
       - expect
       - rename
       - lastpass-cli
+      - ykman
       - pwgen
       - terminal-notifier
-      - yubikey-personalization
 # Intel Edison / IoT tools
       - dfu-util
       - coreutils
@@ -326,9 +326,6 @@ node_attributes:
       - osxfuse
       - lastpass
       - yubico-authenticator
-      - yubico-yubikey-manager
-      - yubico-yubikey-piv-manager
-      - yubico-yubikey-personalization-gui
       - java
 #      - cyberduck
       - pcloud-drive