diff --git a/omnibus/config/software/chef-dk.rb b/omnibus/config/software/chef-dk.rb
index e16b486fb..6b24c89f2 100644
--- a/omnibus/config/software/chef-dk.rb
+++ b/omnibus/config/software/chef-dk.rb
@@ -57,10 +57,12 @@
 
   env["NOKOGIRI_USE_SYSTEM_LIBRARIES"] = "true"
 
-  appbundle "berkshelf", lockdir: project_dir, without: %w{guard changelog}, env: env
-  appbundle "chef", lockdir: project_dir, without: %w{changelog integration docgen maintenance ci travis}, env: env
+  appbundle "chef", lockdir: project_dir, without: %w{integration docgen maintenance ci travis}, env: env
+  appbundle "foodcritic", lockdir: project_dir, without: %w{development}, env: env
+  appbundle "test-kitchen", lockdir: project_dir, without: %w{changelog debug docs}, env: env
+  appbundle "inspec", lockdir: project_dir, without: %w{deploy tools maintenance}, env: env
 
-  %w{chef-dk chef-vault foodcritic ohai test-kitchen opscode-pushy-client cookstyle inspec dco}.each do |gem|
+  %w{chef-dk chef-vault ohai opscode-pushy-client cookstyle dco berkshelf}.each do |gem|
     appbundle gem, lockdir: project_dir, without: %w{changelog}, env: env
   end