diff --git a/.codeclimate.yml b/.codeclimate.yml
index a57cd75758..04b3ebcf7e 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,10 +1,9 @@
----
 version: '2'
 prepare:
   fetch:
-  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
     path: ".rubocop_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_cc_base.yml
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
     path: ".rubocop_cc_base.yml"
 checks:
   argument-count:
@@ -28,7 +27,7 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: 'rubocop-0-69'
+    channel: rubocop-0-82
 exclude_patterns:
 - node_modules/
 - spec/
diff --git a/.rubocop.yml b/.rubocop.yml
index ac92639e75..c7ff3d3ca4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,4 @@
 inherit_from:
-- https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
-- .rubocop_local.yml
+- ".rubocop_local.yml"
+inherit_gem:
+  manageiq-style: ".rubocop_base.yml"
diff --git a/.rubocop_cc.yml b/.rubocop_cc.yml
index f613872a68..5c3969f477 100644
--- a/.rubocop_cc.yml
+++ b/.rubocop_cc.yml
@@ -1,4 +1,4 @@
 inherit_from:
-- .rubocop_base.yml
-- .rubocop_cc_base.yml
-- .rubocop_local.yml
+- ".rubocop_base.yml"
+- ".rubocop_cc_base.yml"
+- ".rubocop_local.yml"
diff --git a/manageiq-providers-nuage.gemspec b/manageiq-providers-nuage.gemspec
index caaf612a98..47d61c3dcc 100644
--- a/manageiq-providers-nuage.gemspec
+++ b/manageiq-providers-nuage.gemspec
@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "excon", "~>0.71"
 
+  spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "simplecov"
 end