diff --git a/tools/docker/amd64/centos-7.Dockerfile b/tools/docker/amd64/centos-7.Dockerfile
index 32a2cfed86..4fa81742f7 100644
--- a/tools/docker/amd64/centos-7.Dockerfile
+++ b/tools/docker/amd64/centos-7.Dockerfile
@@ -19,7 +19,7 @@ RUN yum -y update \
 SHELL ["/bin/bash", "--login", "-c"]
 ENTRYPOINT ["/usr/bin/bash", "--login", "-c"]
 CMD ["/usr/bin/bash", "--login"]
-# RUN gcc --version
+# RUN g++ --version
 
 # Install CMake 3.21.1
 RUN wget -q "https://cmake.org/files/v3.21/cmake-3.21.1-linux-x86_64.sh" \
diff --git a/tools/docker/amd64/centos-8.Dockerfile b/tools/docker/amd64/centos-8.Dockerfile
index 2ac8c6b694..4fe9cd5c0a 100644
--- a/tools/docker/amd64/centos-8.Dockerfile
+++ b/tools/docker/amd64/centos-8.Dockerfile
@@ -9,18 +9,18 @@ RUN dnf -y update \
 && dnf -y install wget redhat-lsb-core pkgconfig autoconf libtool zlib-devel which \
 && dnf clean all \
 && rm -rf /var/cache/dnf
-ENTRYPOINT ["/usr/bin/bash", "-c"]
-CMD ["/usr/bin/bash"]
 
 # Install system build dependencies
 ENV PATH=/usr/local/bin:$PATH
 RUN dnf -y update \
 && dnf -y install gcc-toolset-11 \
 && dnf clean all \
-&& rm -rf /var/cache/dnf
-
-RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc
-SHELL ["/bin/bash", "--login", "-c"]
+&& rm -rf /var/cache/dnf \
+&& echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc
+SHELL ["/usr/bin/bash", "--login", "-c"]
+ENTRYPOINT ["/usr/bin/bash", "--login", "-c"]
+CMD ["/usr/bin/bash", "--login"]
+# RUN g++ --version
 
 # Install CMake 3.21.1
 RUN wget -q "https://cmake.org/files/v3.21/cmake-3.21.1-linux-x86_64.sh" \