diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic
index 6180a54..aa337a5 100644
--- a/Dockerfile.omnibus-gitlab-bionic
+++ b/Dockerfile.omnibus-gitlab-bionic
@@ -13,6 +13,7 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 ENV RUBY_VERSION 2.6.3
+ENV RUBYGEMS_VERSION 3.0.6
 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \
   | tar -xzC /tmp \
   && cd "/tmp/ruby-${RUBY_VERSION}" \
@@ -21,4 +22,5 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.ta
   && make install \
   && cd / \
   && rm -rf "/tmp/ruby-${RUBY_VERSION}" \
+  && gem update --system ${RUBYGEMS_VERSION} --no-document \
   && gem install bundler --no-document
diff --git a/Dockerfile.omnibus-gitlab-buster b/Dockerfile.omnibus-gitlab-buster
index 418e7be..9c0f249 100644
--- a/Dockerfile.omnibus-gitlab-buster
+++ b/Dockerfile.omnibus-gitlab-buster
@@ -14,6 +14,7 @@ ENV LC_ALL en_US.UTF-8
 
 
 ENV RUBY_VERSION 2.6.3
+ENV RUBYGEMS_VERSION 3.0.6
 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \
   | tar -xzC /tmp \
   && cd "/tmp/ruby-${RUBY_VERSION}" \
@@ -22,4 +23,5 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.ta
   && make install \
   && cd / \
   && rm -rf "/tmp/ruby-${RUBY_VERSION}" \
+  && gem update --system ${RUBYGEMS_VERSION} --no-document \
   && gem install bundler --no-document
diff --git a/Dockerfile.omnibus-gitlab-centos6 b/Dockerfile.omnibus-gitlab-centos6
index 5ed1961..6f510bb 100644
--- a/Dockerfile.omnibus-gitlab-centos6
+++ b/Dockerfile.omnibus-gitlab-centos6
@@ -11,6 +11,7 @@ ENV LC_ALL en_US.UTF-8
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 
 ENV RUBY_VERSION 2.6.3
+ENV RUBYGEMS_VERSION 3.0.6
 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \
   | tar -xzC /tmp \
   && cd "/tmp/ruby-${RUBY_VERSION}" \
@@ -19,4 +20,5 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.ta
   && make install \
   && cd / \
   && rm -rf "/tmp/ruby-${RUBY_VERSION}" \
+  && gem update --system ${RUBYGEMS_VERSION} --no-document \
   && gem install bundler --no-document
diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7
index e8386e3..dfa564d 100644
--- a/Dockerfile.omnibus-gitlab-centos7
+++ b/Dockerfile.omnibus-gitlab-centos7
@@ -11,6 +11,7 @@ ENV LC_ALL en_US.UTF-8
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 
 ENV RUBY_VERSION 2.6.3
+ENV RUBYGEMS_VERSION 3.0.6
 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \
   | tar -xzC /tmp \
   && cd "/tmp/ruby-${RUBY_VERSION}" \
@@ -19,4 +20,5 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.ta
   && make install \
   && cd / \
   && rm -rf "/tmp/ruby-${RUBY_VERSION}" \
+  && gem update --system ${RUBYGEMS_VERSION} --no-document \
   && gem install bundler --no-document
diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie
index 55d8920..c2b7f6c 100644
--- a/Dockerfile.omnibus-gitlab-jessie
+++ b/Dockerfile.omnibus-gitlab-jessie
@@ -13,6 +13,7 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 ENV RUBY_VERSION 2.6.3
+ENV RUBYGEMS_VERSION 3.0.6
 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \
   | tar -xzC /tmp \
   && cd "/tmp/ruby-${RUBY_VERSION}" \
@@ -21,4 +22,5 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.ta
   && make install \
   && cd / \
   && rm -rf "/tmp/ruby-${RUBY_VERSION}" \
+  && gem update --system ${RUBYGEMS_VERSION} --no-document \
   && gem install bundler --no-document
diff --git a/Dockerfile.omnibus-gitlab-opensuse15.0 b/Dockerfile.omnibus-gitlab-opensuse15.0
index e8e3f7f..ff487cc 100644
--- a/Dockerfile.omnibus-gitlab-opensuse15.0
+++ b/Dockerfile.omnibus-gitlab-opensuse15.0
@@ -12,6 +12,7 @@ ENV LANGUAGE en_US:en
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 
 ENV RUBY_VERSION 2.6.3
+ENV RUBYGEMS_VERSION 3.0.6
 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \
   | tar -xzC /tmp \
   && cd "/tmp/ruby-${RUBY_VERSION}" \
@@ -20,4 +21,5 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.ta
   && make install \
   && cd / \
   && rm -rf "/tmp/ruby-${RUBY_VERSION}" \
+  && gem update --system ${RUBYGEMS_VERSION} --no-document \
   && gem install bundler --no-document