diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic
index aa337a5..5dc35f4 100644
--- a/Dockerfile.omnibus-gitlab-bionic
+++ b/Dockerfile.omnibus-gitlab-bionic
@@ -22,5 +22,4 @@ 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
+  && gem update --system ${RUBYGEMS_VERSION} --no-document
diff --git a/Dockerfile.omnibus-gitlab-buster b/Dockerfile.omnibus-gitlab-buster
index 9c0f249..b170e68 100644
--- a/Dockerfile.omnibus-gitlab-buster
+++ b/Dockerfile.omnibus-gitlab-buster
@@ -23,5 +23,4 @@ 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
+  && gem update --system ${RUBYGEMS_VERSION} --no-document
diff --git a/Dockerfile.omnibus-gitlab-centos6 b/Dockerfile.omnibus-gitlab-centos6
index 6f510bb..bd87f41 100644
--- a/Dockerfile.omnibus-gitlab-centos6
+++ b/Dockerfile.omnibus-gitlab-centos6
@@ -20,5 +20,4 @@ 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
+  && gem update --system ${RUBYGEMS_VERSION} --no-document
diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7
index dfa564d..8486e69 100644
--- a/Dockerfile.omnibus-gitlab-centos7
+++ b/Dockerfile.omnibus-gitlab-centos7
@@ -20,5 +20,4 @@ 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
+  && gem update --system ${RUBYGEMS_VERSION} --no-document
diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie
index c2b7f6c..db6999a 100644
--- a/Dockerfile.omnibus-gitlab-jessie
+++ b/Dockerfile.omnibus-gitlab-jessie
@@ -22,5 +22,4 @@ 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
+  && gem update --system ${RUBYGEMS_VERSION} --no-document
diff --git a/Dockerfile.omnibus-gitlab-opensuse15.0 b/Dockerfile.omnibus-gitlab-opensuse15.0
index ff487cc..218d292 100644
--- a/Dockerfile.omnibus-gitlab-opensuse15.0
+++ b/Dockerfile.omnibus-gitlab-opensuse15.0
@@ -21,5 +21,4 @@ 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
+  && gem update --system ${RUBYGEMS_VERSION} --no-document
diff --git a/Dockerfile.omnibus-gitlab-opensuse42.3 b/Dockerfile.omnibus-gitlab-opensuse42.3
index 961c4b8..7630719 100644
--- a/Dockerfile.omnibus-gitlab-opensuse42.3
+++ b/Dockerfile.omnibus-gitlab-opensuse42.3
@@ -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,4 @@ 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 install bundler --no-document
+  && gem update --system ${RUBYGEMS_VERSION} --no-document