diff --git a/omnibus/.gitignore b/omnibus/.gitignore
index 2677e3b9f..6417a1683 100644
--- a/omnibus/.gitignore
+++ b/omnibus/.gitignore
@@ -9,3 +9,4 @@ cookbooks
 vendor/cookbooks
 build_timestamp
 ldd.out
+Berksfile.lock
diff --git a/omnibus/config/projects/chefdk.rb b/omnibus/config/projects/chefdk.rb
index aaccc501e..38ffce771 100644
--- a/omnibus/config/projects/chefdk.rb
+++ b/omnibus/config/projects/chefdk.rb
@@ -32,6 +32,11 @@
   install_dir "#{default_root}/#{name}"
 end
 
+override :ruby, version: "2.1.6"
+override :'ruby-windows-devkit', version: "4.7.2-20130224" if windows? && windows_arch_i386?
+override :bundler,      version: "1.11.2"
+override :rubygems,     version: "2.5.2"
+
 # Uncomment to pin the chef version
 override :chef,             version: "12.8.1"
 override :ohai,             version: "v8.12.0"
@@ -59,15 +64,6 @@
 # override :libxml2,        version: "2.9.3"
 override :libxslt,        version: "1.1.28"
 
-if windows?
-  override :'ruby-windows', version: "2.1.6"
-  if windows_arch_i386?
-    override :'ruby-windows-devkit', version: "4.7.2-20130224"
-  end
-else
-  override :ruby,           version: "2.1.6"
-end
-
 override :rubocop, version: "v0.37.2"
 
 override :'kitchen-vagrant', version: "v0.19.0"
@@ -89,6 +85,7 @@
 dependency "chef-provisioning-fog"
 dependency "chef-provisioning-vagrant"
 dependency "chef-provisioning-azure"
+dependency "ruby-windows-devkit" if windows?
 dependency "rubygems-customization"
 dependency "shebang-cleanup"
 dependency "version-manifest"
diff --git a/omnibus/config/software/chefdk-env-customization.rb b/omnibus/config/software/chefdk-env-customization.rb
index fe3607257..c97c0b177 100644
--- a/omnibus/config/software/chefdk-env-customization.rb
+++ b/omnibus/config/software/chefdk-env-customization.rb
@@ -21,7 +21,7 @@
 
 source path: "#{project.files_path}/#{name}"
 
-dependency "ruby-windows"
+dependency "ruby"
 
 build do
   block "Add chefdk_env_customization file" do
diff --git a/omnibus/config/software/chefdk.rb b/omnibus/config/software/chefdk.rb
index 7ad1b8c82..70a360400 100644
--- a/omnibus/config/software/chefdk.rb
+++ b/omnibus/config/software/chefdk.rb
@@ -39,17 +39,13 @@
 
 relative_path "chef-dk"
 
-if windows?
-  dependency "ruby-windows"
-  dependency "ruby-windows-devkit"
-else
-  dependency "libffi" if debian?
-  dependency "ruby"
-end
+dependency "ruby"
 
 dependency "rubygems"
 dependency "bundler"
 dependency "appbundler"
+# windows does not have native readline support with compiled ruby
+dependency "rb-readline" if windows?
 dependency "chef"
 dependency "test-kitchen"
 dependency "inspec"
diff --git a/omnibus/config/software/rubygems-customization.rb b/omnibus/config/software/rubygems-customization.rb
index 2d6565756..9e484c8a6 100644
--- a/omnibus/config/software/rubygems-customization.rb
+++ b/omnibus/config/software/rubygems-customization.rb
@@ -19,12 +19,7 @@
 
 source path: "#{project.files_path}/#{name}"
 
-if windows?
-  dependency "ruby-windows"
-else
-  dependency "ruby"
-end
-
+dependency "ruby"
 dependency "rubygems"
 
 build do