diff --git a/Dockerfile.danger b/Dockerfile.danger
index 2cd42b7..9d0c045 100644
--- a/Dockerfile.danger
+++ b/Dockerfile.danger
@@ -1,4 +1,4 @@
-FROM ruby:2.6.3-stretch
+FROM ruby:2.7.2-buster
 MAINTAINER GitLab Quality Team
 
 # Danger manipulates git diff output. When an unicode char is present in the diff, it chokes with
@@ -6,19 +6,25 @@ MAINTAINER GitLab Quality Team
 # eg. https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/275286625
 ENV LC_ALL "C.UTF-8"
 
+ENV NODE_VERSION=12.4.0
+ENV YARN_VERSION=1.21.1-1
+ENV GITLAB_GEM_VERSION=4.16.1
+ENV DANGER_GEM_VERSION=8.2.1
+ENV DANGER_GITLAB_GEM_VERSION=8.0.0
+
 ADD /scripts/ /scripts/
 
 RUN apt-get update \
     && apt-get install -y git \
-    && /scripts/install-node 12.4.0 1.21.1-1 \
+    && /scripts/install-node ${NODE_VERSION} ${YARN_VERSION} \
     && yarn global add alex@7 \
     && yarn cache clean \
     && apt-get autoremove -yq \
     && apt-get clean -yqq \
     && rm -rf /var/lib/apt/lists/* \
-    && gem install gitlab --version 4.16.1 --no-document \
-    && gem install danger --version 8.0.6 --no-document \
-    && gem install danger-gitlab --version 8.0.0 --no-document \
+    && gem install gitlab --version ${GITLAB_GEM_VERSION} --no-document \
+    && gem install danger --version ${DANGER_GEM_VERSION} --no-document \
+    && gem install danger-gitlab --version ${DANGER_GITLAB_GEM_VERSION} --no-document \
     && git version \
     && echo "node version " $(node --version) \
     && echo "yarn version " $(yarn --version) \