diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index d18c8585d..5d2237302 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -126,7 +126,7 @@ packages: {
   ],
 
   ubuntu: [
-    'ccache,curl,git,libfontconfig1,sudo,python3-pip',
+    'acl,ccache,curl,git,libfontconfig1,sudo,python3-pip',
   ],
 
   # Default gcc/g++ package is 5.
diff --git a/ansible/roles/docker/templates/centos7.Dockerfile.j2 b/ansible/roles/docker/templates/centos7.Dockerfile.j2
index de337e74e..01f4c5c69 100644
--- a/ansible/roles/docker/templates/centos7.Dockerfile.j2
+++ b/ansible/roles/docker/templates/centos7.Dockerfile.j2
@@ -14,6 +14,7 @@ ENV DESTCPU {{ arch }}
 ENV ARCH {{ arch }}
 
 RUN yum -y update && \
+    yum install -y centos-release-scl && \
     yum install -y \
       gcc \
       gcc-c++ \
@@ -22,12 +23,12 @@ RUN yum -y update && \
       java-11-openjdk-headless \
       pkgconfig \
       curl \
-      python3-pip \
+      rh-python38-python-pip \
       fontconfig-devel \
       libtool \
       automake
 
-RUN pip3 install tap2junit=={{ tap2junit_version }}
+RUN . /opt/rh/rh-python38/enable && pip3 install tap2junit=={{ tap2junit_version }}
 
 RUN groupadd --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
 
@@ -39,7 +40,6 @@ RUN yum -y install ccache
 RUN yum -y install glibc-devel zip unzip perl openssh-clients libgomp make scl-utils avahi kernel-devel policycoreutils-python which libgfortran
 RUN rpm -ivh https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-runtime-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libs-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-runtime-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-ltrace-0.7.91-17.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-strace-4.12-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-client-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-gfortran-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-binutils-2.27-12.el7.1.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libelf-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gdb-7.12.1-48.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-make-4.1-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-c++-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-memstomp-0.1.5-5.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-dwz-0.12-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-toolchain-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-valgrind-3.12.0-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-libstdc++-devel-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-oprofile-1.1.0-4.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-devel-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-perftools-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-6.1-1.el7.aarch64.rpm
 
-RUN yum -y install centos-release-scl
 RUN yum -y install devtoolset-8 devtoolset-8-libatomic-devel
 
 VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
@@ -49,6 +49,7 @@ USER iojs:iojs
 ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }}
 
 CMD cd /home/iojs \
+  && . /opt/rh/rh-python38/enable \
   && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
   && java -Xmx{{ server_ram|default('128m') }} \
           -jar /home/{{ server_user }}/agent.jar \
diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
index 5f5653995..edee9b654 100644
--- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
@@ -94,7 +94,7 @@ ENV ZLIB12DIR /opt/zlib_$ZLIBVER
 
 RUN mkdir -p /tmp/zlib_$ZLIBVER && \
     cd /tmp/zlib_$ZLIBVER && \
-    curl -sL https://zlib.net/zlib-$ZLIBVER.tar.gz | tar zxv --strip=1 && \
+    curl -sL https://zlib.net/fossils/zlib-$ZLIBVER.tar.gz | tar zxv --strip=1 && \
     ./configure --prefix=$ZLIB12DIR && \
     make -j 6 && \
     make install && \
diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
index b45b2e01f..f15a62939 100644
--- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
@@ -19,6 +19,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
       ccache \
       g++-8 \
       gcc-8 \
+      g++-10 \
+      gcc-10 \
       git \
       openjdk-17-jre-headless \
       pkg-config \
diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
index 2e713f072..e5f6bd12b 100644
--- a/jenkins/scripts/select-compiler.sh
+++ b/jenkins/scripts/select-compiler.sh
@@ -239,6 +239,18 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
       fi
       echo "Compiler set to GCC" `$CXX -dumpversion`
       ;;
+    *ubuntu2004_sharedlibs* )
+      if [ "$NODEJS_MAJOR_VERSION" -gt "19" ]; then
+        export CC="ccache gcc-10"
+        export CXX="ccache g++-10"
+        export LINK="g++-10"
+      else
+        export CC="ccache gcc"
+        export CXX="ccache g++"
+        export LINK="g++"
+      fi
+      echo "Compiler set to GCC" `$CXX -dumpversion`
+      ;;
   esac
 
 fi