diff --git a/Gemfile b/Gemfile
index b920b9f73de..8e7fed3a4b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,11 +19,17 @@ def manageiq_plugin(plugin_name)
   end
 end
 
-manageiq_plugin "manageiq-schema"
+gem "manageiq-schema", :github => "jrafanie/manageiq-schema", :branch => "rails71"  # merge and release
+
+# TODO PR and release
+gem 'activerecord-id_regions', :path => "/Users/joerafaniello/Code/activerecord-id_regions"
 
 # Unmodified gems
 gem "activerecord-session_store",       "~>2.0"
-gem "activerecord-virtual_attributes",  "~>7.0.0"
+
+# TODO PR and release
+gem "activerecord-virtual_attributes", :git => "https://github.com/jrafanie/activerecord-virtual_attributes.git", :branch => "rails71"  # merge and release
+
 gem "acts_as_tree",                     "~>2.7" # acts_as_tree needs to be required so that it loads before ancestry
 gem "ancestry",                         "~>4.1.0",           :require => false
 gem "awesome_spawn",                    "~>1.6",             :require => false
@@ -45,15 +51,17 @@ gem "gettext_i18n_rails",               "~>1.11"
 gem "gettext_i18n_rails_js",            "~>1.3.0"
 gem "hamlit",                           "~>2.11.0"
 gem "inifile",                          "~>3.0",             :require => false
-gem "inventory_refresh",                "~>2.1",             :require => false
+
+gem 'inventory_refresh',                "~>2.2",             :require => false
 gem "kubeclient",                       "~>4.0",             :require => false # For scaling pods at runtime
 gem "linux_admin",                      ">=3.0", "<5",       :require => false
 gem "listen",                           "~>3.2",             :require => false
-gem "manageiq-api-client",              "~>0.5.0",           :require => false
-gem "manageiq-loggers",                 "~>1.0", ">=1.1.1",  :require => false
-gem "manageiq-messaging",               "~>1.0", ">=1.4.3",  :require => false
+#TODO Release
+gem 'manageiq-api-client', :github => "ManageIQ/manageiq-api-client" # release
+gem "manageiq-loggers",                 "~>1.2",             :require => false
+gem "manageiq-messaging",               "~>1.5",             :require => false
 gem "manageiq-password",                "~>1.0",             :require => false
-gem "manageiq-postgres_ha_admin",       "~>3.3",             :require => false
+gem "manageiq-postgres_ha_admin", :github => "ManageIQ/manageiq-postgres_ha_admin" # release
 gem "manageiq-ssh-util",                "~>0.2.0",           :require => false
 gem "memoist",                          "~>0.16.0",          :require => false
 gem "money",                            "~>6.13.5",          :require => false
@@ -224,9 +232,13 @@ end
 
 group :ovirt, :manageiq_default do
   manageiq_plugin "manageiq-providers-ovirt"
+  # Release and bump provider plugin
+  gem 'ovirt_metrics', :github => 'ManageIQ/ovirt_metrics'
 end
 
 group :vmware, :manageiq_default do
+  # MOVE TO plugin dependency
+  gem "vmware_web_service",           "~>3.4.0",           :require => false
   manageiq_plugin "manageiq-providers-vmware"
 end