diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 000000000..797220f60
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,5 @@
+plugins:
+  rubocop:
+    enabled: true
+    config:
+      file: .rubocop.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e6c17dd0..e6d03f248 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,4 @@
-rubocop:
-  stage: test
-  only:
-    - dev
-  image: sleede/rubocop-fm:latest
-  script:
-    - git diff --name-only master --diff-filter AMT | grep \\.rb$ | xargs bundle exec rubocop
-
+include:
+  - template: Code-Quality.gitlab-ci.yml
+  stages:
+    - test