diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 66ea47e069..ba561bc272 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -6,6 +6,10 @@ on:
   workflow_dispatch:
   schedule:
     - cron: 0 5 * * *
+  push:
+    branches: [main]
+    paths:
+      - '.github/workflows/containers.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/docker/Dockerfile.rhel b/docker/Dockerfile.rhel
index a42fd426b4..8fcf268fc0 100644
--- a/docker/Dockerfile.rhel
+++ b/docker/Dockerfile.rhel
@@ -12,10 +12,9 @@ SHELL [ "/bin/bash", "-c" ]
 
 ENV PATH /usr/local/bin:${PATH}
 
-RUN yum update -y && \
-    yum groupinstall -y "Development Tools" && \
+RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && \
-    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel && \
+    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
     yum clean all && \
     python3 -m pip install 'cmake==3.21.4'
 
@@ -24,13 +23,11 @@ ARG AMDGPU_RPM=5.4/rhel/8.7/amdgpu-install-5.4.50400-1.el8.noarch.rpm
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         OS_VERSION_MAJOR=$(cat /etc/os-release | grep 'VERSION_ID' | sed 's/=/ /1' | awk '{print $NF}' | sed 's/"//g' | sed 's/\./ /g' | awk '{print $1}') && \
-        yum update -y && \
         if [ "${OS_VERSION_MAJOR}" -eq 8 ]; then PERL_REPO=powertools; else PERL_REPO=crb; fi && \
         dnf -y --enablerepo=${PERL_REPO} install perl-File-BaseDir && \
         yum install -y https://repo.radeon.com/amdgpu-install/${AMDGPU_RPM} && \
         amdgpu-install --usecase=rocm,hip,hiplibsdk --no-dkms --skip-broken -y && \
         yum install -y rocm-hip-sdk rocm-smi-lib roctracer-dev rocprofiler-dev && \
-        yum update -y && \
         yum clean all; \
     fi
 
diff --git a/docker/Dockerfile.rhel.ci b/docker/Dockerfile.rhel.ci
index 67b91a017a..a3b41c7520 100644
--- a/docker/Dockerfile.rhel.ci
+++ b/docker/Dockerfile.rhel.ci
@@ -16,10 +16,9 @@ ARG EXTRA_PACKAGES=""
 ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
 ARG NJOBS="12"
 
-RUN yum update -y && \
-    yum groupinstall -y "Development Tools" && \
+RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && \
-    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel && \
+    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
     yum clean all && \
     python3 -m pip install 'cmake==3.21.4'
 
diff --git a/docker/build-docker-ci.sh b/docker/build-docker-ci.sh
index 92bb339253..434bfb941a 100755
--- a/docker/build-docker-ci.sh
+++ b/docker/build-docker-ci.sh
@@ -139,9 +139,9 @@ verbose-run rm -rf ./dyninst-source/{build,install}*
 
 set -e
 
-if [ "${DISTRO}" = "opensuse" ]; then 
+if [ "${DISTRO}" = "opensuse" ]; then
     DISTRO_IMAGE="opensuse/leap"
-elif [ "${DISTRO}" = "rhel" ]; then 
+elif [ "${DISTRO}" = "rhel" ]; then
     DISTRO_IMAGE="rockylinux"
 else
     DISTRO_IMAGE=${DISTRO}