diff --git a/projects/rocprofiler-systems/docker/build-docker.sh b/projects/rocprofiler-systems/docker/build-docker.sh
index e138ae1ed7..0950f641b4 100755
--- a/projects/rocprofiler-systems/docker/build-docker.sh
+++ b/projects/rocprofiler-systems/docker/build-docker.sh
@@ -26,15 +26,15 @@ declare -a MATRIX_ROCM_VERSIONS=()
 
 load-matrix()
 {
-    local workflow_file="$(git rev-parse --show-toplevel)/.github/workflows/rocprofiler-systems-containers.yml"
-    if [ ! -f "${workflow_file}" ]; then
-        echo -e "\n Error: Cannot find ${workflow_file}"
+    local container_file="$(realpath "${SCRIPT_DIR}/containers.yml")"
+    if [ ! -f "${container_file}" ]; then
+        echo -e "\n Error: Cannot find ${container_file}"
         exit 1
     fi
 
     # In form os-distro;os-version;rocm-version
     local matrix_data=$(awk '
-    /rocprofiler-systems-release:/, /steps:/ {
+    /matrix:/, /steps:/ {
         if (/- os-distro:/) {
             gsub(/[[:space:]]*- os-distro:[[:space:]]*"/, "")
             gsub(/"/, "")
@@ -52,7 +52,7 @@ load-matrix()
             printf "%s;%s;%s\n", distro, version, rocm
         }
     }
-    ' "${workflow_file}")
+    ' "${container_file}")
 
     while IFS=';' read -r os_distro os_version rocm_version; do
         MATRIX_DISTROS+=("$os_distro")
diff --git a/projects/rocprofiler-systems/docker/containers.yml b/projects/rocprofiler-systems/docker/containers.yml
new file mode 100644
index 0000000000..d9aad90bdc
--- /dev/null
+++ b/projects/rocprofiler-systems/docker/containers.yml
@@ -0,0 +1,71 @@
+# Supported OS + ROCm combinations for continuous integration
+
+matrix:
+  # ubuntu 22.04
+  - os-distro: "ubuntu"
+    os-version: "22.04"
+    rocm-version: "0.0"
+  - os-distro: "ubuntu"
+    os-version: "22.04"
+    rocm-version: "6.3"
+  - os-distro: "ubuntu"
+    os-version: "22.04"
+    rocm-version: "6.4"
+  # ubuntu 24.04
+  - os-distro: "ubuntu"
+    os-version: "24.04"
+    rocm-version: "0.0"
+  - os-distro: "ubuntu"
+    os-version: "24.04"
+    rocm-version: "6.3"
+  - os-distro: "ubuntu"
+    os-version: "24.04"
+    rocm-version: "6.4"
+  # opensuse 15.5
+  - os-distro: "opensuse"
+    os-version: "15.5"
+    rocm-version: "0.0"
+  - os-distro: "opensuse"
+    os-version: "15.5"
+    rocm-version: "6.3"
+  # opensuse 15.6
+  - os-distro: "opensuse"
+    os-version: "15.6"
+    rocm-version: "0.0"
+  - os-distro: "opensuse"
+    os-version: "15.6"
+    rocm-version: "6.3"
+  - os-distro: "opensuse"
+    os-version: "15.6"
+    rocm-version: "6.4"
+  # RHEL 8.10
+  - os-distro: "rhel"
+    os-version: "8.10"
+    rocm-version: "0.0"
+  - os-distro: "rhel"
+    os-version: "8.10"
+    rocm-version: "6.3"
+  - os-distro: "rhel"
+    os-version: "8.10"
+    rocm-version: "6.4"
+  # RHEL 9.4
+  - os-distro: "rhel"
+    os-version: "9.4"
+    rocm-version: "0.0"
+  - os-distro: "rhel"
+    os-version: "9.4"
+    rocm-version: "6.3"
+  - os-distro: "rhel"
+    os-version: "9.4"
+    rocm-version: "6.4"
+  # RHEL 9.5
+  - os-distro: "rhel"
+    os-version: "9.5"
+    rocm-version: "0.0"
+  - os-distro: "rhel"
+    os-version: "9.5"
+    rocm-version: "6.3"
+  - os-distro: "rhel"
+    os-version: "9.5"
+    rocm-version: "6.4"
+  - os-distro: "rhel"