diff --git a/.github/workflows/rhel-8.yml b/.github/workflows/rhel-8.yml
index 084226a32c..0181d49216 100644
--- a/.github/workflows/rhel-8.yml
+++ b/.github/workflows/rhel-8.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: RHEL 8
+name: RHEL 8/9
 
 # Controls when the workflow will run
 on:
@@ -32,7 +32,12 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container:
-       image: colramos/target-images:rhel8
+      image: dgaliffiamd/rocprofiler-systems:ci-base-rhel-${{ matrix.os-release }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os-release: [ '8.10', '9.3']
+        build-type: ['Release']
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Install baseline OS dependencies
diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml
index 9b260cad85..61e1a95fb1 100644
--- a/.github/workflows/ubuntu-jammy.yml
+++ b/.github/workflows/ubuntu-jammy.yml
@@ -30,15 +30,15 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container:
-       image: rocm/dev-ubuntu-22.04:5.7.1
+      image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-22.04
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Install baseline OS dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install -y git
-          sudo apt-get install -y python3-pip
-          sudo apt-get install -y cmake
+          apt-get update
+          apt-get install -y git
+          apt-get install -y python3-pip
+          apt-get install -y cmake
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Python prereqs