diff --git a/components/gems/Gemfile b/components/gems/Gemfile
index 4cce1f5be..6911d0094 100644
--- a/components/gems/Gemfile
+++ b/components/gems/Gemfile
@@ -27,8 +27,8 @@ group(:omnibus_package, :development, :test) do
   gem "pry"
   gem "yard"
   gem "guard"
-  gem "cookstyle", "~> 5.0"
-  gem "foodcritic", ">= 16.0"
+  gem "cookstyle", "~> 5.20"
+  gem "foodcritic", ">= 16.2"
   gem "ffi-libarchive"
 end
 
@@ -44,10 +44,6 @@ end
 group(:omnibus_package) do
   gem "appbundler"
 
-  ## avoid ffi warnings about overwriting struct layouts which 1.12 introduced
-  # https://github.com/chef/chef-workstation/issues/904 tracks fixing this in win32-service
-  gem "ffi", "< 1.12"
-
   ## Until we resolve https://github.com/inspec/train/issues/548
   gem "train", "=3.2.0"
   gem "train-core", "=3.2.0"
@@ -82,15 +78,15 @@ group(:omnibus_package) do
   gem "kitchen-vcenter", ">= 2.0"
 
   # knife plugins
-  gem "knife-acl", "= 1.0.6"
-  gem "knife-azure", "= 2.0.6"
-  gem "knife-ec2", "= 1.0.28"
-  gem "knife-google", "= 4.2.4"
-  gem "knife-tidy", ">= 1.2.0"
-  gem "knife-windows", "= 3.0.6"
-  gem "knife-opc", ">= 0.4.0"
-  gem "knife-vcenter", "= 3.0.0"
-  gem "knife-vsphere", "= 4.0.8"
+  gem "knife-acl", ">= 1.0.6"
+  gem "knife-azure", ">= 2.0.11"
+  gem "knife-ec2", ">= 1.0.28"
+  gem "knife-google", ">= 4.2.7"
+  gem "knife-tidy", ">= 2.0.9"
+  gem "knife-windows", ">= 3.0.11"
+  gem "knife-opc", ">= 0.4.1"
+  gem "knife-vcenter", ">= 3.0.1"
+  gem "knife-vsphere", ">= 4.1.1"
 
   # ed25519 ssh key support done here as it's a native gem we can't put in train
   gem "ed25519"
@@ -144,5 +140,5 @@ platforms :mswin, :mingw do
   gem "win32-event"
   gem "win32-mutex"
   gem "win32-process", "~> 0.8.2"
-  gem "win32-service"
+  gem "win32-service", ">= 2.1.5" # 2.1.5 resolves ffi warnings
 end
diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
index 2010f244b..0e0a53cf4 100644
--- a/components/gems/Gemfile.lock
+++ b/components/gems/Gemfile.lock
@@ -389,9 +389,9 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     fauxhai-ng (7.5.1)
       net-ssh
-    ffi (1.11.3)
-    ffi (1.11.3-x64-mingw32)
-    ffi (1.11.3-x86-mingw32)
+    ffi (1.12.2)
+    ffi (1.12.2-x64-mingw32)
+    ffi (1.12.2-x86-mingw32)
     ffi-libarchive (1.0.0)
       ffi (~> 1.0)
     ffi-rzmq (2.0.7)
@@ -541,7 +541,7 @@ GEM
       test-kitchen (>= 1.16, < 3.0)
       vsphere-automation-sdk (~> 0.4)
     knife-acl (1.0.6)
-    knife-azure (2.0.6)
+    knife-azure (2.0.11)
       azure_mgmt_compute (~> 0.18, >= 0.18.3)
       azure_mgmt_network (~> 0.18, >= 0.18.2)
       azure_mgmt_resources (~> 0.17, >= 0.17.2)
@@ -560,28 +560,27 @@ GEM
       aws-sdk-ec2 (~> 1.95)
       aws-sdk-s3 (~> 1.43)
       chef (>= 15.1)
-    knife-google (4.2.4)
+    knife-google (4.2.7)
       gcewinpass (~> 1.1)
-      google-api-client (>= 0.23.9, < 0.35.0)
+      google-api-client (>= 0.23.9, < 0.37.0)
       knife-cloud (>= 2.0.0)
     knife-opc (0.4.1)
     knife-push (1.1.5)
       chef (>= 13.0)
     knife-tidy (2.0.9)
-    knife-vcenter (3.0.0)
+    knife-vcenter (3.0.1)
       knife-cloud (>= 1.2, < 3.0)
       rb-readline (~> 0.5)
       rbvmomi (>= 1.11, < 3.0)
       savon (~> 2.11)
       vsphere-automation-sdk (~> 0.4)
-    knife-vsphere (4.0.8)
+    knife-vsphere (4.1.1)
       chef (>= 15.1)
-      chef-bin (>= 15.1)
       chef-vault (>= 2.6.0)
       filesize (>= 0.1.1, < 0.3.0)
       netaddr (~> 1.5)
       rbvmomi (>= 1.8, < 3.0)
-    knife-windows (3.0.6)
+    knife-windows (3.0.11)
       chef (>= 15.0)
       winrm (~> 2.1)
       winrm-elevated (~> 1.0)
@@ -916,7 +915,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
+    tty-screen (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-table (0.11.0)
@@ -1004,7 +1003,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.2)
+    winrm-elevated (1.2.0)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
@@ -1036,15 +1035,14 @@ DEPENDENCIES
   cheffish (>= 14.0.1)
   chefspec (>= 9.0.0, < 10.0)
   chefstyle
-  cookstyle (~> 5.0)
+  cookstyle (~> 5.20)
   dep-selector-libgecode
   dep_selector
   ed25519
   fauxhai-ng (~> 7.5)
-  ffi (< 1.12)
   ffi-libarchive
   ffi-rzmq-core
-  foodcritic (>= 16.0)
+  foodcritic (>= 16.2)
   guard
   inspec (~> 4.18)
   inspec-bin (~> 4.18)
@@ -1057,16 +1055,16 @@ DEPENDENCIES
   kitchen-inspec (>= 1.0)
   kitchen-vagrant (>= 1.6)
   kitchen-vcenter (>= 2.0)
-  knife-acl (= 1.0.6)
-  knife-azure (= 2.0.6)
-  knife-ec2 (= 1.0.28)
-  knife-google (= 4.2.4)
-  knife-opc (>= 0.4.0)
+  knife-acl (>= 1.0.6)
+  knife-azure (>= 2.0.11)
+  knife-ec2 (>= 1.0.28)
+  knife-google (>= 4.2.7)
+  knife-opc (>= 0.4.1)
   knife-push
-  knife-tidy (>= 1.2.0)
-  knife-vcenter (= 3.0.0)
-  knife-vsphere (= 4.0.8)
-  knife-windows (= 3.0.6)
+  knife-tidy (>= 2.0.9)
+  knife-vcenter (>= 3.0.1)
+  knife-vsphere (>= 4.1.1)
+  knife-windows (>= 3.0.11)
   listen
   mdl (>= 0.7.0)
   minitest (<= 5.11.3)
@@ -1095,7 +1093,7 @@ DEPENDENCIES
   win32-event
   win32-mutex
   win32-process (~> 0.8.2)
-  win32-service
+  win32-service (>= 2.1.5)
   windows-pr
   winrm-elevated
   winrm-fs
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a11a0e82c..bdcbd6108 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
     retryable (3.0.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (2.1.0)
+    rubyzip (2.2.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -328,7 +328,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
+    tty-screen (0.7.1)
     unicode-display_width (1.6.1)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
@@ -365,7 +365,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.2)
+    winrm-elevated (1.2.0)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)