diff --git a/.github/workflows/images_build_test.yml b/.github/workflows/images_build_test.yml
index 9bf6a341a..0462dfdab 100644
--- a/.github/workflows/images_build_test.yml
+++ b/.github/workflows/images_build_test.yml
@@ -860,6 +860,9 @@ jobs:
             # Chromium on Ubuntu is not available on s390x platform
             elif [ "$MATRIX_OS" == "ubuntu" ] && [ "$MATRIX_BUILD" == "web-service" ]; then
                 platform_list="linux/amd64,linux/arm/v7,linux/arm64"
+            # Chromium on RedHat is not available on ppc64le, s390x platforms
+            elif [ "$MATRIX_OS" == "rhel" ] && [ "$MATRIX_BUILD" == "web-service" ]; then
+                platform_list="linux/amd64,linux/arm64"
             else
                 platform_list=$(jq -r ".[\"os-linux\"].\"$MATRIX_OS\" | join(\",\")" "$MATRIX_FILE")
             fi
@@ -981,6 +984,13 @@ jobs:
              cp -R "/tmp/secrets/" "$CONTEXT/"
              ls -lah "$CONTEXT/"
 
+      - name: Remove smartmontools
+        if: ${{ matrix.build == 'agent2' && matrix.os == 'rhel' }}
+        env:
+          DOCKERFILES_DIRECTORY: ${{ env.DOCKERFILES_DIRECTORY }}
+        run: |
+          sed -i '/smartmontools/d' "$DOCKERFILES_DIRECTORY/agent2/rhel/Dockerfile"
+
       - name: Login to DockerHub
         if: ${{ env.AUTO_PUSH_IMAGES == 'true' }}
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile
index 25519b909..97036f893 100644
--- a/Dockerfiles/agent2/rhel/Dockerfile
+++ b/Dockerfiles/agent2/rhel/Dockerfile
@@ -65,12 +65,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             smartmontools \
             sudo \
             libcurl-minimal" && \
-    ARCH_SUFFIX="$(arch)"; \
     microdnf -y install \
             --disableplugin=subscription-manager \
             --disablerepo "*" \
             --enablerepo "ubi-9-baseos-rpms" \
-            --enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-beta-rpms" \
             --enablerepo "epel" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
diff --git a/Dockerfiles/build-base/rhel/secrets.tar.gz b/Dockerfiles/build-base/rhel/secrets.tar.gz
new file mode 100644
index 000000000..e2f119b80
Binary files /dev/null and b/Dockerfiles/build-base/rhel/secrets.tar.gz differ