diff --git a/projects/rocprofiler-compute/docker/build-docker.sh b/projects/rocprofiler-compute/docker/build-docker.sh
index 4597898203..3b58a886c9 100755
--- a/projects/rocprofiler-compute/docker/build-docker.sh
+++ b/projects/rocprofiler-compute/docker/build-docker.sh
@@ -177,10 +177,13 @@ do
                 4.1* | 4.0*)
                     ROCM_REPO_DIST="xenial"
                     ;;
-                5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.0 | 6.0.*)
+                5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*)
                     case "${VERSION}" in
+                        24.04)
+                            ROCM_REPO_DIST="noble"
+                            ;;
                         22.04)
-                            ROCM_REPO_DIST="ubuntu"
+                            ROCM_REPO_DIST="jammy"
                             ;;
                         20.04)
                             ROCM_REPO_DIST="focal"
diff --git a/projects/rocprofiler-compute/src/utils/utils.py b/projects/rocprofiler-compute/src/utils/utils.py
index ce38e8c9d0..65699702d3 100644
--- a/projects/rocprofiler-compute/src/utils/utils.py
+++ b/projects/rocprofiler-compute/src/utils/utils.py
@@ -824,7 +824,7 @@ def detect_roofline(mspec):
         # Must be a valid SLES machine
         # Use SP3 binary for all forward compatible service pack versions
         distro = "15.3"
-    elif ubuntu_distro == "20.04" or ubuntu_distro == "22.04":
+    elif ubuntu_distro == "20.04" or ubuntu_distro == "22.04" or ubuntu_distro == "24.04":
         # Must be a valid Ubuntu machine
         distro = ubuntu_distro
     else:
@@ -867,6 +867,7 @@ def mibench(args, mspec):
         "15.3": "sles15sp5",
         "20.04": "ubuntu20_04",
         "22.04": "ubuntu20_04",
+        "24.04": "ubuntu20_04",
     }
 
     binary_paths = []