diff --git a/projects/rocprofiler-systems/.github/workflows/containers.yml b/projects/rocprofiler-systems/.github/workflows/containers.yml
index 09bb556028..58164ac067 100644
--- a/projects/rocprofiler-systems/.github/workflows/containers.yml
+++ b/projects/rocprofiler-systems/.github/workflows/containers.yml
@@ -23,7 +23,7 @@ jobs:
   rocprofiler-systems-ci:
     if: github.repository == 'ROCm/rocprofiler-systems'
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
@@ -78,7 +78,7 @@ jobs:
   rocprofiler-systems-release:
     if: github.repository == 'ROCm/rocprofiler-systems'
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
diff --git a/projects/rocprofiler-systems/.github/workflows/cpack.yml b/projects/rocprofiler-systems/.github/workflows/cpack.yml
index e922318f70..b8acd2602f 100644
--- a/projects/rocprofiler-systems/.github/workflows/cpack.yml
+++ b/projects/rocprofiler-systems/.github/workflows/cpack.yml
@@ -28,7 +28,7 @@ env:
 jobs:
   installers:
     if: github.repository == 'ROCm/rocprofiler-systems'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/projects/rocprofiler-systems/.github/workflows/opensuse.yml b/projects/rocprofiler-systems/.github/workflows/opensuse.yml
index 3559224af5..185688de46 100644
--- a/projects/rocprofiler-systems/.github/workflows/opensuse.yml
+++ b/projects/rocprofiler-systems/.github/workflows/opensuse.yml
@@ -39,7 +39,7 @@ env:
 
 jobs:
   opensuse:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
       image: dgaliffiamd/rocprofiler-systems:ci-base-opensuse-${{ matrix.os-release }}
     strategy:
diff --git a/projects/rocprofiler-systems/.github/workflows/release.yml b/projects/rocprofiler-systems/.github/workflows/release.yml
index 2415b29c8e..1d9dda52f9 100644
--- a/projects/rocprofiler-systems/.github/workflows/release.yml
+++ b/projects/rocprofiler-systems/.github/workflows/release.yml
@@ -17,7 +17,7 @@ env:
 jobs:
   release:
     if: github.repository == 'ROCm/rocprofiler-systems'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       packages: write
diff --git a/projects/rocprofiler-systems/.github/workflows/ubuntu-jammy.yml b/projects/rocprofiler-systems/.github/workflows/ubuntu-jammy.yml
index 0cde63c860..6e5f4cd835 100644
--- a/projects/rocprofiler-systems/.github/workflows/ubuntu-jammy.yml
+++ b/projects/rocprofiler-systems/.github/workflows/ubuntu-jammy.yml
@@ -39,7 +39,7 @@ env:
 
 jobs:
   ubuntu-jammy-external:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
       image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-22.04
     strategy:
diff --git a/projects/rocprofiler-systems/.github/workflows/ubuntu-noble.yml b/projects/rocprofiler-systems/.github/workflows/ubuntu-noble.yml
index c4ce69efa5..3c2be97ecc 100644
--- a/projects/rocprofiler-systems/.github/workflows/ubuntu-noble.yml
+++ b/projects/rocprofiler-systems/.github/workflows/ubuntu-noble.yml
@@ -39,7 +39,7 @@ env:
 
 jobs:
   ubuntu-noble:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
       image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-24.04
     strategy:
diff --git a/projects/rocprofiler-systems/docker/Dockerfile.opensuse.ci b/projects/rocprofiler-systems/docker/Dockerfile.opensuse.ci
index 2267cf6a66..ad416a78d3 100644
--- a/projects/rocprofiler-systems/docker/Dockerfile.opensuse.ci
+++ b/projects/rocprofiler-systems/docker/Dockerfile.opensuse.ci
@@ -29,9 +29,9 @@ RUN zypper --non-interactive update -y && \
     zypper --non-interactive install -y -t pattern devel_basis && \
     zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel \
         gcc-c++ git libnuma-devel openmpi3-devel papi-devel python3-pip \
-        rpm-build wget && \
+        rpm-build vim wget && \
     zypper --non-interactive clean --all && \
-    python3 -m pip install 'cmake==3.21'
+    python3 -m pip install 'cmake==3.21' perfetto
 
 COPY ./dyninst-source /tmp/dyninst
 
diff --git a/projects/rocprofiler-systems/docker/Dockerfile.rhel.ci b/projects/rocprofiler-systems/docker/Dockerfile.rhel.ci
index 071e3c2bce..9ae294788d 100644
--- a/projects/rocprofiler-systems/docker/Dockerfile.rhel.ci
+++ b/projects/rocprofiler-systems/docker/Dockerfile.rhel.ci
@@ -20,10 +20,9 @@ ARG NJOBS="8"
 RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \
     yum install -y --allowerasing cmake curl dpkg-devel numactl-devel \
-        openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
+        openmpi-devel papi-devel python3-pip texinfo wget which vim zlib-devel && \
     yum clean all && \
-    python3 -m pip install 'cmake==3.21' && \
-    python3 -m pip install 'perfetto'
+    python3 -m pip install 'cmake==3.21' perfetto
 
 COPY ./dyninst-source /tmp/dyninst
 
diff --git a/projects/rocprofiler-systems/docker/Dockerfile.ubuntu.ci b/projects/rocprofiler-systems/docker/Dockerfile.ubuntu.ci
index 36c26f6bdc..312949338b 100644
--- a/projects/rocprofiler-systems/docker/Dockerfile.ubuntu.ci
+++ b/projects/rocprofiler-systems/docker/Dockerfile.ubuntu.ci
@@ -28,12 +28,12 @@ RUN apt-get update && \
     apt-get install -y autoconf autotools-dev bash-completion bison build-essential \
         bzip2 cmake curl environment-modules flex gettext git-core gnupg2 gzip \
         libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 \
-        python3-pip texinfo unzip wget zip zlib1g-dev && \
+        python3-pip texinfo unzip wget vim zip zlib1g-dev && \
     apt-get autoclean && \
     if [ "${OS_VERSION}" == "24.04" ]; then \
-        python3 -m pip install --break-system-packages 'cmake==3.21' \
+        python3 -m pip install --break-system-packages 'cmake==3.21' perfetto \
     else \
-        python3 -m pip install 'cmake==3.21'; \
+        python3 -m pip install 'cmake==3.21' perfetto; \
     fi
 
 COPY ./dyninst-source /tmp/dyninst