diff --git a/Gemfile b/Gemfile
index a80a961b8..3ea0dbe96 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,12 +31,6 @@ group :integration do
   gem 'kitchen-dokken'
 end
 
-group :simulator do
-  gem 'github-markup'
-  gem 'redcarpet'
-  gem 'docker-api'
-end
-
 group :tools do
   gem 'pry', '~> 0.10'
   gem 'rb-readline'
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index fd937a6df..7add7c67d 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -11,7 +11,7 @@ source 'https://rubygems.org'
 # gem 'omnibus-software', github: 'chef/omnibus-software', branch: 'ksubrama/ruby23'
 
 # Use entries from chef's Gemfile
-gem 'omnibus', github: 'chef/omnibus', branch: 'sersut/ff-ksubrama/gcc_investigate'
+gem 'omnibus', github: 'chef/omnibus'
 gem 'omnibus-software', github: 'chef/omnibus-software'
 gem 'license_scout', github: 'chef/license_scout'
 
diff --git a/www/Gemfile b/www/Gemfile
index 64f16c703..70e4a3097 100644
--- a/www/Gemfile
+++ b/www/Gemfile
@@ -19,3 +19,9 @@ gem 'middleman-livereload'
 gem 'middleman-autoprefixer'
 gem 'middleman-syntax'
 gem 'redcarpet'
+
+group :simulator do
+  gem 'github-markup'
+  gem 'redcarpet'
+  gem 'docker-api'
+end