diff --git a/.codeclimate.yml b/.codeclimate.yml
index 216ecf43beb222a7029e5abcf0250bcf529e3c6a..8699a903f2ab8fc539c432732041ed266650e58e 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -10,12 +10,6 @@ engines:
       - javascript
     exclude_paths:
       - "lib/api/v3/*"
-  eslint:
-    enabled: true
-    channel: "eslint-4"
-  rubocop:
-    enabled: true
-    channel: "gitlab-rubocop-0-52-1"
 ratings:
   paths:
   - Gemfile.lock
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 505f5034aa58c416e5a4ac58ccacd103a868f6f6..eac9be7d6ee80fd4fc162ddc0a3dc88f14d72b97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -722,9 +722,6 @@ codequality:
   cache: {}
   dependencies: []
   script:
-    # Get the custom rubocop codeclimate image (https://gitlab.com/gitlab-org/codeclimate-rubocop/wikis/home)
-    - docker pull dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-rubocop-0-52-1
-    - docker tag dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-rubocop-0-52-1 codeclimate/codeclimate-rubocop:gitlab-codeclimate-rubocop-0-52-1
     # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
     - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
     - docker run --env SOURCE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code