diff --git a/gitaly/Dockerfile.build.ubi8 b/gitaly/Dockerfile.build.ubi8
index 438839e7527c4983f62f669162fb47bf0eb9f084..aa51b57ed84cf328ceb197b7bf92ad5d260ca9c1 100644
--- a/gitaly/Dockerfile.build.ubi8
+++ b/gitaly/Dockerfile.build.ubi8
@@ -33,9 +33,9 @@ RUN mkdir /assets \
     && rm -rf /srv/gitaly-ruby/spec /srv/gitaly-ruby/features \
     && touch .ruby-bundle \
     && make install \
-    && /build-scripts/cleanup-gems /usr/lib/ruby/gems \
+    && /build-scripts/cleanup-gems ${LIBDIR}/ruby/gems \
     && cp -R --parents \
       /usr/local/bin/gitaly* \
-      /usr/lib/ruby/gems/ \
+      ${LIBDIR}/ruby/gems/ \
       /srv/gitaly-ruby \
       /assets
diff --git a/gitlab-exporter/Dockerfile.build.ubi8 b/gitlab-exporter/Dockerfile.build.ubi8
index 048d8af20333baf392011552b1d99f3dc74407e7..9e3cc5a177979fde5a0a10d9fba1a0bebea2405a 100644
--- a/gitlab-exporter/Dockerfile.build.ubi8
+++ b/gitlab-exporter/Dockerfile.build.ubi8
@@ -8,12 +8,12 @@ ADD gitlab-ruby.tar.gz /
 ADD postgresql.tar.gz /
 
 RUN mkdir /assets \
-    && mv /usr/local/postgresql/bin/* /usr/bin/ \
-    && mv /usr/local/postgresql/lib/* /usr/lib/ \
+    && install /usr/local/postgresql/bin/* /usr/bin/ \
+    && cp -R /usr/local/postgresql/lib/. ${LIBDIR}/ \
     && mv /usr/local/postgresql/include/* /usr/include/ \
     && mv /usr/local/postgresql/share/* /usr/share/ \
     && gem install gitlab-exporter -v ${GITLAB_EXPORTER_VERSION} \
     && cp -R --parents \
-        /usr/lib/ruby/gems \
+        ${LIBDIR}/ruby/gems \
         /usr/bin/gitlab-exporter \
         /assets
diff --git a/gitlab-mailroom/Dockerfile.build.ubi8 b/gitlab-mailroom/Dockerfile.build.ubi8
index 5fd0c165d3fa210d09c139bda9859920515f581c..dfca9f4b5319632f072020768e31192e38a1fc2a 100644
--- a/gitlab-mailroom/Dockerfile.build.ubi8
+++ b/gitlab-mailroom/Dockerfile.build.ubi8
@@ -13,8 +13,8 @@ RUN mkdir /assets \
       gitlab-mail_room:${MAILROOM_VERSION} \
       charlock_holmes:0.7.6 \
       redis:4.2.2 redis-namespace:1.6.0 \
-    && /build-scripts/cleanup-gems /usr/lib/ruby/gems \
+    && /build-scripts/cleanup-gems ${LIBDIR}/ruby/gems \
     && cp -R --parents \
-      /usr/lib/ruby/gems \
+      ${LIBDIR}/ruby/gems \
       /usr/bin/mail_room \
       /assets
diff --git a/gitlab-rails/Dockerfile.build.ubi8 b/gitlab-rails/Dockerfile.build.ubi8
index 263c248b598ebb947951b3e96a24ca0ca7c69150..1e5f44f9973026f118cf5b4b705aa0ea994cbb2b 100644
--- a/gitlab-rails/Dockerfile.build.ubi8
+++ b/gitlab-rails/Dockerfile.build.ubi8
@@ -24,10 +24,10 @@ ADD gitlab-graphicsmagick.tar.gz /
 ENV PRIVATE_TOKEN=${API_TOKEN}
 
 RUN mkdir /assets \
-    && cp /usr/local/postgresql/bin/* /usr/bin/ \
-    && cp -R /usr/local/postgresql/lib/* /usr/lib/ \
-    && cp -R /usr/local/postgresql/include/* /usr/include/ \
-    && cp -R /usr/local/postgresql/share/* /usr/share/ \
+    && install /usr/local/postgresql/bin/* /usr/bin/ \
+    && cp -R /usr/local/postgresql/lib/. ${LIBDIR}/ \
+    && cp -R /usr/local/postgresql/include/. /usr/include/ \
+    && cp -R /usr/local/postgresql/share/. /usr/share/ \
     && curl --retry 6 -L https://github.com/google/re2/archive/${LIBRE2_VERSION}.tar.gz | tar -xz \
     && cd re2-${LIBRE2_VERSION} \
     && make \
@@ -66,10 +66,10 @@ RUN /gitlab-fetch \
 
 COPY --from=assets assets /srv/gitlab/public/assets/
 
-RUN mkdir -p /assets/usr/{bin,lib} \
+RUN mkdir -p /assets/usr/{bin,lib} /assets${LIBDIR} \
     && cp /usr/local/bin/gitlab-elasticsearch-indexer /assets/usr/bin/ \
-    && cp /usr/local/postgresql/bin/* /assets/usr/bin/ \
-    && cp -R /usr/local/postgresql/lib/* /assets/usr/lib/ \
+    && install /usr/local/postgresql/bin/* /assets/usr/bin/ \
+    && cp -R /usr/local/postgresql/lib/. /assets${LIBDIR}/ \
     && cp -R --parents \
         /usr/local/lib/libre2.* \
         /srv/gitlab \
diff --git a/gitlab-ruby/Dockerfile.build.ubi8 b/gitlab-ruby/Dockerfile.build.ubi8
index da579f10a9b54b35c869dc4e6fc004ad265e09f6..b2325c9126c60c5d932caf23bd23b0fb9c935e7e 100644
--- a/gitlab-ruby/Dockerfile.build.ubi8
+++ b/gitlab-ruby/Dockerfile.build.ubi8
@@ -15,7 +15,7 @@ COPY shared/build-scripts/ /build-scripts
 RUN mkdir /assets \
     && curl --retry 6 -s https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR_VERSION}/ruby-${RUBY_MINOR_VERSION}.tar.gz | tar -xz \
     && cd ruby-${RUBY_MINOR_VERSION} \
-    && ./configure --prefix=/usr --disable-dtrace --disable-install-doc --disable-install-rdoc --enable-shared --with-out-ext=dbm,readline --without-gmp --without-gdbm --without-tk \
+    && ./configure --prefix=/usr --libdir=${LIBDIR} --disable-dtrace --disable-install-doc --disable-install-rdoc --enable-shared --with-out-ext=dbm,readline --without-gmp --without-gdbm --without-tk \
     && make -j "$(nproc)" \
     && make -j "$(nproc)" install \
     && gem update --no-document --system ${RUBYGEMS_VERSION} \
@@ -23,9 +23,9 @@ RUN mkdir /assets \
     && cd .. \
     && curl --retry 6 -sL https://github.com/connoratherton/rb-readline/archive/v${RBREADLINE_VERSION}.tar.gz | tar -xz \
     && ruby rb-readline-${RBREADLINE_VERSION}/setup.rb \
-    && /build-scripts/cleanup-gems /usr/lib/ruby/gems \
+    && /build-scripts/cleanup-gems ${LIBDIR}/ruby/gems \
     && cp -R --parents \
       /usr/bin/{ruby,rdoc,irb,erb,rake,gem,bundler,bundle} \
-      /usr/lib/{ruby/,libruby.*} \
+      ${LIBDIR}/{ruby/,libruby.*} \
       /usr/include/ruby-*/ \
       /assets
diff --git a/gitlab-task-runner/Dockerfile.ubi8 b/gitlab-task-runner/Dockerfile.ubi8
index 6506a0ff625013b782d28a6959096709a04b75fe..5c5882addd63453587f354db155a3388a77cc72a 100644
--- a/gitlab-task-runner/Dockerfile.ubi8
+++ b/gitlab-task-runner/Dockerfile.ubi8
@@ -19,7 +19,7 @@ ADD gitlab-task-runner-ee.tar.gz /
 ADD gitlab-python.tar.gz /
 
 COPY scripts/bin/* /usr/local/bin/
-COPY scripts/lib/* /usr/lib/ruby/vendor_ruby/
+COPY scripts/lib/* ${LIBDIR}/ruby/vendor_ruby/
 
 RUN dnf clean all \
     && rm -r /var/cache/dnf \