diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a219c7abccf83054e19fc1e18f438c8f9f029796..87aae9b2e1ba709e01c64e5f746e59db72594490 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@ stages:
 
 test:
   stage: test
-  image: docker:stable
+  image: docker:20.10.12
   services:
-    - docker:stable-dind
+    - docker:20.10.12-dind
   variables:
     DOCKER_DRIVER: overlay2
   script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a65059c6af94fedd05e0254a2e9369eec8e5221b..53507c66d0c5897558feace4685137c46f5e4185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ GitLab Code Quality versions follow the Code Climate versions used, and generate
 
 ## master (unreleased)
 
+## 0.87.0
+- Upgrade base image and ruby version
+
 ## 0.85.29
 
 - Add eslint-8 channel for eslint plugin  (!53 @Sanjeev2k19)
diff --git a/VERSION b/VERSION
index 358c956df427f4f03fe5c208d349780cfeec23ac..359ee08a7ce9c6f0008ef6080cf3b6745552feae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.85.29
+0.87.0
diff --git a/run.sh b/run.sh
index 923aa779c3f70a1b1d23fad00684f15812980f71..bfa8ce3ac00164b08d0caabc955fd3ba4093fa42 100755
--- a/run.sh
+++ b/run.sh
@@ -33,7 +33,7 @@ REPORT_FILENAME_PREFIX="gl-code-quality-report"
 REPORT_FORMAT=${REPORT_FORMAT:-json}
 DEFAULT_FILES_PATH=${DEFAULT_FILES_PATH:-/codeclimate_defaults}
 
-CODECLIMATE_VERSION=${CODECLIMATE_VERSION:-0.85.29}
+CODECLIMATE_VERSION=${CODECLIMATE_VERSION:-0.87.0}
 CODECLIMATE_IMAGE=${CODECLIMATE_IMAGE:-codeclimate/codeclimate}
 CODECLIMATE_FULL_IMAGE="${CODECLIMATE_PREFIX}${CODECLIMATE_IMAGE}:${CODECLIMATE_VERSION}"