diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index b256c04f11..f5ff05f0ae 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -7,7 +7,7 @@ on:
   schedule:
     - cron: 0 5 * * *
   push:
-    branches: [main, amd-mainline]
+    branches: [amd-staging, amd-mainline]
     paths:
       - '.github/workflows/containers.yml'
       - 'docker/**'
@@ -20,8 +20,8 @@ env:
   GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
 
 jobs:
-  rocprofiler-systemss-ci:
-    if: github.repository == 'ROCm/omnitrace'
+  rocprofiler-systems-ci:
+    if: github.repository == 'ROCm/rocprofiler-systems'
 
     runs-on: ubuntu-20.04
 
@@ -34,15 +34,17 @@ jobs:
           - distro: "ubuntu"
             version: "22.04"
           - distro: "opensuse"
-            version: "15.3"
+            version: "15.5"
           - distro: "opensuse"
-            version: "15.4"
+            version: "15.6"
           - distro: "rhel"
-            version: "8.7"
+            version: "8.8"
           - distro: "rhel"
-            version: "9.0"
+            version: "8.10"
           - distro: "rhel"
-            version: "9.1"
+            version: "9.2"
+          - distro: "rhel"
+            version: "9.4"
 
     steps:
       - uses: actions/checkout@v4
@@ -74,7 +76,7 @@ jobs:
             popd
 
   rocprofiler-systems-release:
-    if: github.repository == 'ROCm/omnitrace'
+    if: github.repository == 'ROCm/rocprofiler-systems'
 
     runs-on: ubuntu-20.04
 
@@ -88,140 +90,56 @@ jobs:
             rocm-version: "0.0"
           - os-distro: "ubuntu"
             os-version: "20.04"
-            rocm-version: "4.5"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.0"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.1"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.2"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.3"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.4"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.5"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.6"
+            rocm-version: "6.2"
           # ubuntu 22.04
           - os-distro: "ubuntu"
             os-version: "22.04"
             rocm-version: "0.0"
           - os-distro: "ubuntu"
             os-version: "22.04"
-            rocm-version: "5.3"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.4"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.5"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.6"
-          # opensuse 15.3
+            rocm-version: "6.2"
+          # opensuse 15.5
           - os-distro: "opensuse"
-            os-version: "15.3"
+            os-version: "15.5"
             rocm-version: "0.0"
           - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "4.5"
+            os-version: "15.5"
+            rocm-version: "6.2"
+          # opensuse 15.6
           - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.0"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.1"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.2"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.3"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.4"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.5"
-          # opensuse 15.4
-          - os-distro: "opensuse"
-            os-version: "15.4"
+            os-version: "15.6"
             rocm-version: "0.0"
           - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.0"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.1"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.2"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.3"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.4"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.5"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.6"
-          # RHEL 8.7
+            os-version: "15.6"
+            rocm-version: "6.2"
+          # RHEL 8.8
           - os-distro: "rhel"
-            os-version: "8.7"
+            os-version: "8.8"
             rocm-version: "0.0"
           - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.3"
+            os-version: "8.8"
+            rocm-version: "6.2"
+          # RHEL 8.10
           - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.4"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.5"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.6"
-          # RHEL 9.0
-          - os-distro: "rhel"
-            os-version: "9.0"
+            os-version: "8.10"
             rocm-version: "0.0"
           - os-distro: "rhel"
-            os-version: "9.0"
-            rocm-version: "5.3"
+            os-version: "8.10"
+            rocm-version: "6.2"
+          # RHEL 9.2
           - os-distro: "rhel"
-            os-version: "9.0"
-            rocm-version: "5.4"
-          - os-distro: "rhel"
-            os-version: "9.0"
-            rocm-version: "5.5"
-          # RHEL 9.1
-          - os-distro: "rhel"
-            os-version: "9.1"
+            os-version: "9.2"
             rocm-version: "0.0"
           - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.3"
+            os-version: "9.2"
+            rocm-version: "6.2"
+          # RHEL 9.4
           - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.4"
+            os-version: "9.4"
+            rocm-version: "0.0"
           - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.5"
-          - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.6"
-
+            os-version: "9.4"
+            rocm-version: "6.2"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml
index c4f5c9b6d1..263d5101be 100644
--- a/.github/workflows/cpack.yml
+++ b/.github/workflows/cpack.yml
@@ -4,7 +4,7 @@ run-name: cpack
 on:
   workflow_dispatch:
   push:
-    branches: [main, amd-mainline, release/**]
+    branches: [amd-staging, amd-mainline, release/**]
     tags:
       - "v[1-9].[0-9]+.[0-9]+*"
       - "rocm-[1-9].[0-9]+.[0-9]+*"
@@ -13,7 +13,7 @@ on:
       - 'docs/**'
       - 'source/docs/**'
   pull_request:
-    branches: [main, amd-mainline]
+    branches: [amd-staging, amd-mainline, release/**]
     paths:
       - '.github/workflows/cpack.yml'
       - 'docker/**'
@@ -27,7 +27,7 @@ env:
 
 jobs:
   installers:
-    if: github.repository == 'ROCm/omnitrace'
+    if: github.repository == 'ROCm/rocprofiler-systems'
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -37,24 +37,6 @@ jobs:
           - os-distro: "ubuntu"
             os-version: "20.04"
             rocm-version: "0.0"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.4"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.5"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.6"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "5.7"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "6.0"
-          - os-distro: "ubuntu"
-            os-version: "20.04"
-            rocm-version: "6.1"
           - os-distro: "ubuntu"
             os-version: "20.04"
             rocm-version: "6.2"
@@ -62,176 +44,64 @@ jobs:
           - os-distro: "ubuntu"
             os-version: "22.04"
             rocm-version: "0.0"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.4"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.5"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.6"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "5.7"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "6.0"
-          - os-distro: "ubuntu"
-            os-version: "22.04"
-            rocm-version: "6.1"
           - os-distro: "ubuntu"
             os-version: "22.04"
             rocm-version: "6.2"
-          # opensuse 15.3
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "0.0"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.2"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.3"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.4"
-          - os-distro: "opensuse"
-            os-version: "15.3"
-            rocm-version: "5.5"
-          # opensuse 15.4
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "0.0"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.2"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.3"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.4"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.5"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.6"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "5.7"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "6.0"
-          - os-distro: "opensuse"
-            os-version: "15.4"
-            rocm-version: "6.1"
           # opensuse 15.5
           - os-distro: "opensuse"
             os-version: "15.5"
             rocm-version: "0.0"
-          - os-distro: "opensuse"
-            os-version: "15.5"
-            rocm-version: "5.6"
-          - os-distro: "opensuse"
-            os-version: "15.5"
-            rocm-version: "5.7"
-          - os-distro: "opensuse"
-            os-version: "15.5"
-            rocm-version: "6.0"
-          - os-distro: "opensuse"
-            os-version: "15.5"
-            rocm-version: "6.1"
           - os-distro: "opensuse"
             os-version: "15.5"
             rocm-version: "6.2"
-          # RHEL 8.7
-          - os-distro: "rhel"
-            os-version: "8.7"
+          # opensuse 15.6
+          - os-distro: "opensuse"
+            os-version: "15.6"
             rocm-version: "0.0"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.3"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.4"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.5"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.6"
-          - os-distro: "rhel"
-            os-version: "8.7"
-            rocm-version: "5.7"
+          - os-distro: "opensuse"
+            os-version: "15.6"
+            rocm-version: "6.2"
           # RHEL 8.8
           - os-distro: "rhel"
             os-version: "8.8"
             rocm-version: "0.0"
           - os-distro: "rhel"
             os-version: "8.8"
-            rocm-version: "5.6"
-          - os-distro: "rhel"
-            os-version: "8.8"
-            rocm-version: "5.7"
-          - os-distro: "rhel"
-            os-version: "8.8"
-            rocm-version: "6.0"
-          - os-distro: "rhel"
-            os-version: "8.8"
-            rocm-version: "6.1"
+            rocm-version: "6.2"
           # RHEL 8.9
           - os-distro: "rhel"
             os-version: "8.9"
             rocm-version: "0.0"
-          - os-distro: "rhel"
-            os-version: "8.9"
-            rocm-version: "6.0"
-          - os-distro: "rhel"
-            os-version: "8.9"
-            rocm-version: "6.1"
           - os-distro: "rhel"
             os-version: "8.9"
             rocm-version: "6.2"
-          # RHEL 9.1
+          # RHEL 8.10
           - os-distro: "rhel"
-            os-version: "9.1"
+            os-version: "8.10"
             rocm-version: "0.0"
           - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.4"
-          - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.5"
-          - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.6"
-          - os-distro: "rhel"
-            os-version: "9.1"
-            rocm-version: "5.7"
+            os-version: "8.10"
+            rocm-version: "6.2"
           # RHEL 9.2
           - os-distro: "rhel"
             os-version: "9.2"
             rocm-version: "0.0"
           - os-distro: "rhel"
             os-version: "9.2"
-            rocm-version: "6.0"
-          - os-distro: "rhel"
-            os-version: "9.2"
-            rocm-version: "6.1"
+            rocm-version: "6.2"
           # RHEL 9.3
           - os-distro: "rhel"
             os-version: "9.3"
             rocm-version: "0.0"
           - os-distro: "rhel"
             os-version: "9.3"
-            rocm-version: "6.0"
+            rocm-version: "6.2"
+          # RHEL 9.4
           - os-distro: "rhel"
-            os-version: "9.3"
-            rocm-version: "6.1"
+            os-version: "9.4"
+            rocm-version: "0.0"
           - os-distro: "rhel"
-            os-version: "9.3"
+            os-version: "9.4"
             rocm-version: "6.2"
 
     steps:
@@ -310,7 +180,7 @@ jobs:
 
       - name: Upload STGZ Release Assets
         uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'ROCm/omnitrace'
+        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'ROCm/rocprofiler-systems'
         with:
           fail_on_unmatched_files: True
           files: |
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 4b2340fd35..0000000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: Documentation
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [main, amd-mainline, gh-pages]
-    paths:
-      - '*.md'
-      - 'source/docs/**'
-      - '.github/workflows/docs.yml'
-      - 'VERSION'
-  pull_request:
-    branches: [main, amd-mainline]
-    paths:
-      - '*.md'
-      - 'source/docs/**'
-      - '.github/workflows/docs.yml'
-      - 'VERSION'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-
-jobs:
-  build-docs:
-    runs-on: ubuntu-20.04
-    permissions:
-      contents: read
-      pages: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Conda
-        uses: s-weigand/setup-conda@v1
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Create Docs Directory
-        run:
-          mkdir -p docs
-      - name: Update Docs
-        working-directory: source/docs
-        run: |
-          conda env create -n omnitrace-docs -f environment.yml
-          source activate
-          conda activate omnitrace-docs
-          ./update-docs.sh
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: ./docs
-
-  deploy-docs:
-    if: github.repository == 'ROCm/omnitrace' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/gh-pages')
-    runs-on: ubuntu-20.04
-    needs: build-docs
-    permissions:
-      contents: read
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index f3e4b7df09..f41db760e2 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -4,9 +4,9 @@ run-name: formatting
 
 on:
   push:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
   pull_request:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml
index e6e787a01a..36836733db 100644
--- a/.github/workflows/opensuse.yml
+++ b/.github/workflows/opensuse.yml
@@ -3,7 +3,7 @@ run-name: opensuse-15
 
 on:
   push:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/formatting.yml'
       - 'docker/**'
   pull_request:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -39,12 +39,12 @@ jobs:
   opensuse:
     runs-on: ubuntu-20.04
     container:
-      image: jrmadsen/omnitrace:ci-base-opensuse-${{ matrix.os-release }}
+      image: dgaliffiamd/rocprofiler-systems:ci-base-opensuse-${{ matrix.os-release }}
     strategy:
       fail-fast: false
       matrix:
         compiler: ['g++']
-        os-release: [ '15.3', '15.4' ]
+        os-release: [ '15.5', '15.6' ]
         build-type: ['Release']
 
     steps:
@@ -62,7 +62,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.21.4' &&
           for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done
 
     - name: Configure Env
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 939da19b17..8edbedd503 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -3,12 +3,12 @@ run-name: Python
 
 on:
   push:
-    branches: [ main, develop, amd-mainline, amd-staging ]
+    branches: [ amd-mainline, amd-staging ]
     paths:
       - 'source/python/gui/*.py'
       - 'source/python/gui/**/*.py'
   pull_request:
-    branches: [ main, develop, amd-mainline, amd-staging ]
+    branches: [ amd-mainline, amd-staging ]
     paths:
       - 'source/python/gui/*.py'
       - 'source/python/gui/**/*.py'
diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml
index c7a402b75d..81065b80b9 100644
--- a/.github/workflows/redhat.yml
+++ b/.github/workflows/redhat.yml
@@ -3,7 +3,7 @@ run-name: redhat
 
 on:
   push:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/formatting.yml'
       - 'docker/**'
   pull_request:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -37,25 +37,16 @@ env:
 
 jobs:
   rhel:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container:
-      image: jrmadsen/omnitrace:ci-base-rhel-${{ matrix.os-release }}
+      image: dgaliffiamd/rocprofiler-systems:ci-base-rhel-${{ matrix.os-release }}
     strategy:
       fail-fast: false
       matrix:
         compiler: ['g++']
-        os-release: [ '8.7', '9.0', '9.1' ]
-        rocm-version: [ '0.0', '5.3', '5.4' ]
+        os-release: [ '8.8', '8.10', '9.2', '9.4' ]
+        rocm-version: [ '0.0', '6.2' ]
         build-type: ['Release']
-        include:
-            - compiler: 'g++'
-              os-release: '9.1'
-              rocm-version: '5.5'
-              build-type: 'Release'
-            - compiler: 'g++'
-              os-release: '9.1'
-              rocm-version: '5.6'
-              build-type: 'Release'
 
     steps:
     - uses: actions/checkout@v4
@@ -74,7 +65,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.21.4' &&
           for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done
 
     - name: Install ROCm Packages
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57d68ac158..2415b29c8e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - v*
+      - "v[1-9].[0-9]+.[0-9]+*"
+      - "rocm-[1-9].[0-9]+.[0-9]+*"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,7 +16,7 @@ env:
 
 jobs:
   release:
-    if: github.repository == 'ROCm/omnitrace'
+    if: github.repository == 'ROCm/rocprofiler-systems'
     runs-on: ubuntu-20.04
     permissions:
       contents: write
diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml
index a307b8ad5f..1b65e5e37f 100644
--- a/.github/workflows/ubuntu-focal.yml
+++ b/.github/workflows/ubuntu-focal.yml
@@ -3,7 +3,7 @@ run-name: ubuntu-focal
 
 on:
   push:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/formatting.yml'
       - 'docker/**'
   pull_request:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -39,7 +39,7 @@ jobs:
   ubuntu-focal-external:
     runs-on: ubuntu-20.04
     container:
-      image: jrmadsen/omnitrace:ci-base-ubuntu-20.04
+      image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -98,7 +98,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell &&
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.16.3' &&
           for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done &&
           apt-get -y --purge autoremove &&
           apt-get -y clean &&
@@ -238,18 +237,18 @@ jobs:
   ubuntu-focal-external-rocm:
     runs-on: ubuntu-20.04
     container:
-      image: jrmadsen/omnitrace:ci-base-ubuntu-20.04
+      image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         compiler: ['g++']
-        rocm-version: ['5.4', '5.5', '5.6']
+        rocm-version: ['6.2']
         mpi-headers: ['OFF']
         build-jobs: ['3']
         ctest-exclude: ['-LE "mpi-example|transpose"']
         include:
           - compiler: 'g++'
-            rocm-version: 'debian'
+            rocm-version: 'latest'
             mpi-headers: 'ON'
             build-jobs: '2'
             ctest-exclude: '-LE transpose'
@@ -280,7 +279,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell &&
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.21.4' &&
           for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done &&
           apt-get -y --purge autoremove &&
           apt-get -y clean &&
@@ -443,7 +441,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell &&
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.16.3' &&
           sudo apt-get -y --purge autoremove &&
           sudo apt-get -y clean
 
@@ -572,7 +569,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     container:
-      image: jrmadsen/omnitrace:ci-base-ubuntu-20.04
+      image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-20.04
       options: --cap-add CAP_SYS_ADMIN
 
     env:
@@ -596,7 +593,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell &&
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.24.1' &&
           for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done &&
           apt-get -y --purge autoremove &&
           apt-get -y clean &&
diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml
index 603a1517e4..342d554438 100644
--- a/.github/workflows/ubuntu-jammy.yml
+++ b/.github/workflows/ubuntu-jammy.yml
@@ -3,7 +3,7 @@ run-name: ubuntu-jammy
 
 on:
   push:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/formatting.yml'
       - 'docker/**'
   pull_request:
-    branches: [ main, develop, amd-mainline, amd-staging, release/** ]
+    branches: [ amd-mainline, amd-staging, release/** ]
     paths-ignore:
       - '*.md'
       - 'docs/**'
@@ -39,7 +39,7 @@ jobs:
   ubuntu-jammy-external:
     runs-on: ubuntu-20.04
     container:
-      image: jrmadsen/omnitrace:ci-base-ubuntu-22.04
+      image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -73,7 +73,7 @@ jobs:
             static-libgcc: 'OFF'
             static-libstdcxx: 'OFF'
             build-dyninst: 'OFF'
-            rocm-version: '5.3'
+            rocm-version: '6.2'
           - compiler: 'g++'
             hip: 'ON'
             mpi: 'OFF'
@@ -114,7 +114,6 @@ jobs:
           chmod +x /opt/trace_processor/bin/trace_processor_shell &&
           python3 -m pip install --upgrade pip &&
           python3 -m pip install numpy perfetto dataclasses &&
-          python3 -m pip install 'cmake==3.21.4' &&
           for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done
 
     - name: Install ROCm Packages
diff --git a/cmake/Templates/rocprof-sys-install.py.in b/cmake/Templates/rocprof-sys-install.py.in
index fad5473b57..6d07cd5a45 100755
--- a/cmake/Templates/rocprof-sys-install.py.in
+++ b/cmake/Templates/rocprof-sys-install.py.in
@@ -159,7 +159,7 @@ if __name__ == "__main__":
         action="store_true",
     )
     parser.add_argument(
-        "-p", "--prefix", help="Installation prefix", type=str, default="/opt/rocprof-sys"
+        "-p", "--prefix", help="Installation prefix", type=str, default="/opt/rocprofiler-systems"
     )
     parser.add_argument(
         "-i",
diff --git a/docker/Dockerfile.opensuse b/docker/Dockerfile.opensuse
index 938c329b79..97a55c0d7c 100644
--- a/docker/Dockerfile.opensuse
+++ b/docker/Dockerfile.opensuse
@@ -1,5 +1,5 @@
 ARG DISTRO=opensuse/leap
-ARG VERSION=15.3
+ARG VERSION=15.5
 FROM ${DISTRO}:${VERSION}
 
 ENV HOME /root
@@ -23,11 +23,10 @@ RUN set +e; \
 RUN zypper --non-interactive update -y && \
     zypper --non-interactive dist-upgrade -y && \
     zypper --non-interactive install -y -t pattern devel_basis && \
-    zypper --non-interactive install -y python3-pip openmpi3-devel gcc-c++ git libnuma-devel dpkg-devel rpm-build wget curl binutils-gold && \
-    python3 -m pip install 'cmake==3.21.4'
+    zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel gcc-c++ git libnuma-devel openmpi3-devel python3-pip rpm-build wget
 
 ARG ROCM_VERSION=0.0
-ARG AMDGPU_RPM=latest/sle/15/amdgpu-install-21.50.50000-1.noarch.rpm
+ARG AMDGPU_RPM=6.2/sle/15.6/amdgpu-install-6.2.60200-1.noarch.rpm
 ARG PERL_REPO=SLE_15
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
diff --git a/docker/Dockerfile.opensuse.ci b/docker/Dockerfile.opensuse.ci
index 4d0718287b..2169026e43 100644
--- a/docker/Dockerfile.opensuse.ci
+++ b/docker/Dockerfile.opensuse.ci
@@ -1,5 +1,5 @@
 ARG DISTRO=opensuse/leap
-ARG VERSION=15.3
+ARG VERSION=15.5
 FROM ${DISTRO}:${VERSION}
 
 ENV HOME /root
@@ -13,8 +13,9 @@ SHELL [ "/bin/bash", "-c" ]
 ENV PATH /usr/local/bin:${PATH}
 
 ARG EXTRA_PACKAGES=""
-ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
-ARG NJOBS="12"
+ARG ELFUTILS_DOWNLOAD_VERSION="0.188"
+ARG BOOST_DOWNLOAD_VERSION="1.79.0"
+ARG NJOBS="8"
 
 RUN set +e; \
     zypper --non-interactive -i --gpg-auto-import-keys refresh; \
@@ -26,14 +27,18 @@ RUN set +e; \
 RUN zypper --non-interactive update -y && \
     zypper --non-interactive dist-upgrade -y && \
     zypper --non-interactive install -y -t pattern devel_basis && \
-    zypper --non-interactive install -y python3-pip openmpi3-devel gcc-c++ git libnuma-devel dpkg-devel rpm-build papi-devel curl wget binutils-gold && \
-    python3 -m pip install 'cmake==3.18.4' && \
+    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 && \
     zypper --non-interactive clean --all
 
 COPY ./dyninst-source /tmp/dyninst
 
 RUN cd /tmp/dyninst && \
-    cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_BOOST=ON -DBUILD_TBB=ON -DBUILD_ELFUTILS=ON -DBUILD_LIBIBERTY=ON && \
+    cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_BOOST=ON -DBUILD_TBB=ON \
+        -DBUILD_ELFUTILS=ON -DBUILD_LIBIBERTY=ON \
+        -DElfUtils_DOWNLOAD_VERSION=${ELFUTILS_DOWNLOAD_VERSION} \
+        -DBOOST_DOWNLOAD_VERSION=${BOOST_DOWNLOAD_VERSION} && \
     cmake --build build --target all --parallel ${NJOBS} && \
     cmake --build build --target install --parallel ${NJOBS} && \
     cd /tmp && \
diff --git a/docker/Dockerfile.rhel b/docker/Dockerfile.rhel
index 232cc32b05..6808dc4bb4 100644
--- a/docker/Dockerfile.rhel
+++ b/docker/Dockerfile.rhel
@@ -1,4 +1,4 @@
-ARG DISTRO=rockylinux
+ARG DISTRO=rockylinux/rockylinux
 ARG VERSION=8
 FROM ${DISTRO}:${VERSION}
 
@@ -15,12 +15,11 @@ ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64
 
 RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \
-    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
-    yum clean all && \
-    python3 -m pip install 'cmake==3.21.4'
+    yum install -y --allowerasing cmake curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
+    yum clean all
 
 ARG ROCM_VERSION=0.0
-ARG AMDGPU_RPM=5.4/rhel/8.7/amdgpu-install-5.4.50400-1.el8.noarch.rpm
+ARG AMDGPU_RPM=6.2/rhel/9.4/amdgpu-install-6.2.60202-1.el9.noarch.rpm
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         OS_VERSION_MAJOR=$(cat /etc/os-release | grep 'VERSION_ID' | sed 's/=/ /1' | awk '{print $NF}' | sed 's/"//g' | sed 's/\./ /g' | awk '{print $1}') && \
diff --git a/docker/Dockerfile.rhel.ci b/docker/Dockerfile.rhel.ci
index 3107aed6e3..b2261c8f0f 100644
--- a/docker/Dockerfile.rhel.ci
+++ b/docker/Dockerfile.rhel.ci
@@ -1,4 +1,4 @@
-ARG DISTRO=rockylinux
+ARG DISTRO=rockylinux/rockylinux
 ARG VERSION=8
 FROM ${DISTRO}:${VERSION}
 
@@ -13,19 +13,23 @@ SHELL [ "/bin/bash", "-c" ]
 ENV PATH /usr/local/bin:${PATH}
 
 ARG EXTRA_PACKAGES=""
-ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
-ARG NJOBS="12"
+ARG ELFUTILS_DOWNLOAD_VERSION="0.188"
+ARG BOOST_DOWNLOAD_VERSION="1.79.0"
+ARG NJOBS="8"
 
 RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \
-    yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel  && \
-    yum clean all && \
-    python3 -m pip install 'cmake==3.21.4'
+    yum install -y --allowerasing cmake curl dpkg-devel numactl-devel \
+        openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
+    yum clean all
 
 COPY ./dyninst-source /tmp/dyninst
 
 RUN cd /tmp/dyninst && \
-    cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_BOOST=ON -DBUILD_TBB=ON -DBUILD_ELFUTILS=ON -DBUILD_LIBIBERTY=ON && \
+    cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_BOOST=ON \
+        -DBUILD_TBB=ON -DBUILD_ELFUTILS=ON -DBUILD_LIBIBERTY=ON \
+        -DElfUtils_DOWNLOAD_VERSION=${ELFUTILS_DOWNLOAD_VERSION} \
+        -DBOOST_DOWNLOAD_VERSION=${BOOST_DOWNLOAD_VERSION} && \
     cmake --build build --target all --parallel ${NJOBS} && \
     cmake --build build --target install --parallel ${NJOBS} && \
     cd /tmp && \
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index 48f0cf241e..10f428cc9f 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -24,8 +24,7 @@ ENV PATH ${HOME}/.local/bin:${PATH}
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget && \
-    python3 -m pip install 'cmake==3.21.4'
+    apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${ROCM_REPO_DIST}/${AMDGPU_DEB} && \
diff --git a/docker/Dockerfile.ubuntu.ci b/docker/Dockerfile.ubuntu.ci
index 405095360e..755db1479d 100644
--- a/docker/Dockerfile.ubuntu.ci
+++ b/docker/Dockerfile.ubuntu.ci
@@ -13,29 +13,40 @@ WORKDIR /tmp
 SHELL [ "/bin/bash", "-c" ]
 
 ARG EXTRA_PACKAGES=""
-ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
+ARG ELFUTILS_DOWNLOAD_VERSION="0.188"
 ARG BOOST_DOWNLOAD_VERSION="1.79.0"
-ARG NJOBS="12"
-ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+ARG NJOBS="8"
+
 
 ENV PATH /usr/local/bin:${PATH}
 ENV LIBRARY_PATH /usr/local/lib:/usr/local/lib64:${LIBRARY_PATH}
 ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64:${LD_LIBRARY_PATH}
 ENV CMAKE_PREFIX_PATH /usr/local:${CMAKE_PREFIX_PATH}
 
-COPY ./dyninst-source /tmp/dyninst
-
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y autoconf autotools-dev bash-completion bison build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip texinfo unzip wget zip zlib1g-dev && \
-    python3 -m pip install 'cmake==3.18.4' && \
-    apt-get autoclean && \
-    locale -a && \
-    cd /tmp/dyninst && \
-    cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_BOOST=ON -DBUILD_TBB=ON -DBUILD_ELFUTILS=ON -DBUILD_LIBIBERTY=ON -DELFUTILS_DOWNLOAD_VERSION=${ELFUTILS_DOWNLOAD_VERSION} -DBOOST_DOWNLOAD_VERSION=${BOOST_DOWNLOAD_VERSION} && \
+    apt-get install -y autoconf autotools-dev bash-completion bison build-essential \
+        bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev \
+        libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip texinfo \
+        unzip wget zip zlib1g-dev && \
+    apt-get autoclean
+
+COPY ./dyninst-source /tmp/dyninst
+
+RUN cd /tmp/dyninst && \
+    cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_BOOST=ON \
+        -DBUILD_TBB=ON -DBUILD_ELFUTILS=ON -DBUILD_LIBIBERTY=ON \
+        -DElfUtils_DOWNLOAD_VERSION=${ELFUTILS_DOWNLOAD_VERSION} \
+        -DBOOST_DOWNLOAD_VERSION=${BOOST_DOWNLOAD_VERSION} && \
     cmake --build build --target all --parallel ${NJOBS} && \
     cmake --build build --target install --parallel ${NJOBS} && \
-    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
+    cd /tmp && \
+    shopt -s dotglob extglob && \
+    rm -rf *
+
+ARG PYTHON_VERSIONS="6 7 8 9 10 11 12"
+
+RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \
     bash miniconda.sh -b -p /opt/conda && \
     export PATH="/opt/conda/bin:${PATH}" && \
     conda config --set always_yes yes --set changeps1 no && \
diff --git a/docker/build-docker-ci.sh b/docker/build-docker-ci.sh
index da33ea2f62..ca09bdfc96 100755
--- a/docker/build-docker-ci.sh
+++ b/docker/build-docker-ci.sh
@@ -42,7 +42,7 @@ usage()
     print_default_option versions "[VERSION] [VERSION...]" "Ubuntu, OpenSUSE, or RHEL release" "${VERSIONS}"
     print_default_option python-versions "[VERSION] [VERSION...]" "Python 3 minor releases" "${PYTHON_VERSIONS}"
     print_default_option "jobs -j" "[N]" "parallel build jobs" "${NJOBS}"
-    print_default_option elfutils-version "[0.183..0.186]" "ElfUtils version" "${ELFUTILS_VERSION}"
+    print_default_option elfutils-version "[0.183..0.188]" "ElfUtils version" "${ELFUTILS_VERSION}"
     print_default_option boost-version "[1.67.0..1.79.0]" "Boost version" "${BOOST_VERSION}"
     print_default_option user "[USERNAME]" "DockerHub username" "${USER}"
 }
@@ -142,7 +142,7 @@ set -e
 if [ "${DISTRO}" = "opensuse" ]; then
     DISTRO_IMAGE="opensuse/leap"
 elif [ "${DISTRO}" = "rhel" ]; then
-    DISTRO_IMAGE="rockylinux"
+    DISTRO_IMAGE="rockylinux/rockylinux"
 else
     DISTRO_IMAGE=${DISTRO}
 fi
@@ -152,7 +152,7 @@ do
     verbose-run docker build . \
         ${PULL} \
         -f ${DOCKER_FILE} \
-        --tag ${USER}/omnitrace:ci-base-${DISTRO}-${VERSION} \
+        --tag ${USER}/rocprofiler-systems:ci-base-${DISTRO}-${VERSION} \
         --build-arg DISTRO=${DISTRO_IMAGE} \
         --build-arg VERSION=${VERSION} \
         --build-arg NJOBS=${NJOBS} \
@@ -164,7 +164,7 @@ done
 if [ "${PUSH}" -gt 0 ]; then
     for VERSION in ${VERSIONS}
     do
-        verbose-run docker push ${USER}/omnitrace:ci-base-${DISTRO}-${VERSION}
+        verbose-run docker push ${USER}/rocprofiler-systems:ci-base-${DISTRO}-${VERSION}
     done
 fi
 
diff --git a/docker/build-docker-release.sh b/docker/build-docker-release.sh
index d4338711f7..be7233f97a 100755
--- a/docker/build-docker-release.sh
+++ b/docker/build-docker-release.sh
@@ -86,7 +86,7 @@ build-release()
     shift
     local DOCKER_ARGS=""
     tty -s && DOCKER_ARGS="-it" || DOCKER_ARGS=""
-    verbose-run docker run ${DOCKER_ARGS} --rm -v ${PWD}:/home/omnitrace --stop-signal "SIGINT" --env DISTRO=${OS} --env ROCM_VERSION=${ROCM_VERSION} --env VERSION=${CODE_VERSION} --env PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" --env IS_DOCKER=1 ${CONTAINER} /home/omnitrace/scripts/build-release.sh ${@}
+    verbose-run docker run ${DOCKER_ARGS} --rm -v ${PWD}:/home/rocprofiler-systems --stop-signal "SIGINT" --env DISTRO=${OS} --env ROCM_VERSION=${ROCM_VERSION} --env VERSION=${CODE_VERSION} --env PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" --env IS_DOCKER=1 ${CONTAINER} /home/rocprofiler-systems/scripts/build-release.sh ${@}
 }
 
 reset-last()
@@ -170,6 +170,6 @@ do
     TAG=${DISTRO}-${VERSION}
     for ROCM_VERSION in ${ROCM_VERSIONS}
     do
-        build-release ${USER}/omnitrace:release-base-${TAG}-rocm-${ROCM_VERSION} ${DISTRO}-${VERSION} ${ROCM_VERSION} ${CODE_VERSION} ${SCRIPT_ARGS}
+        build-release ${USER}/rocprofiler-systems:release-base-${TAG}-rocm-${ROCM_VERSION} ${DISTRO}-${VERSION} ${ROCM_VERSION} ${CODE_VERSION} ${SCRIPT_ARGS}
     done
 done
diff --git a/docker/build-docker.sh b/docker/build-docker.sh
index 8f14298f33..79656307d6 100755
--- a/docker/build-docker.sh
+++ b/docker/build-docker.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 : ${USER:=$(whoami)}
-: ${ROCM_VERSIONS:="5.0"}
+: ${ROCM_VERSIONS:="6.2"}
 : ${DISTRO:=ubuntu}
 : ${VERSIONS:=20.04}
 : ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
@@ -159,7 +159,7 @@ do
     VERSION_PATCH=$(echo ${VERSION} | sed 's/\./ /g' | awk '{print $3}')
     for ROCM_VERSION in ${ROCM_VERSIONS}
     do
-        CONTAINER=${USER}/omnitrace:release-base-${DISTRO}-${VERSION}-rocm-${ROCM_VERSION}
+        CONTAINER=${USER}/rocprofiler-systems:release-base-${DISTRO}-${VERSION}-rocm-${ROCM_VERSION}
         ROCM_MAJOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $1}')
         ROCM_MINOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $2}')
         ROCM_PATCH=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $3}')
@@ -174,7 +174,7 @@ do
             ROCM_REPO_DIST="ubuntu"
             ROCM_REPO_VERSION=${ROCM_VERSION}
             case "${ROCM_VERSION}" in
-                5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*)
+                6.*)
                     case "${VERSION}" in
                         22.04)
                             ROCM_REPO_DIST="jammy"
@@ -193,7 +193,7 @@ do
             verbose-build docker build . ${PULL} --progress plain -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg ROCM_REPO_VERSION=${ROCM_REPO_VERSION} --build-arg ROCM_REPO_DIST=${ROCM_REPO_DIST} --build-arg AMDGPU_DEB=${ROCM_DEB} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\"
         elif [ "${DISTRO}" = "rhel" ]; then
             if [ -z "${VERSION_MINOR}" ]; then
-                send-error "Please provide a major and minor version of the OS. Supported: >= 8.7, <= 9.3"
+                send-error "Please provide a major and minor version of the OS. Supported: >= 8.8, <= 9.4"
             fi
 
             # Components used to create the sub-URL below
@@ -203,12 +203,9 @@ do
 
             # set the sub-URL in https://repo.radeon.com/amdgpu-install/<sub-URL>
             case "${ROCM_VERSION}" in
-                5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*)
+                6.*)
                     ROCM_RPM=${ROCM_VERSION}/rhel/${RPM_PATH}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1${RPM_TAG}.noarch.rpm
                     ;;
-                5.2 | 5.2.* | 5.1 | 5.1.* | 5.0 | 5.0.* | 4.*)
-                    send-error "Invalid ROCm version ${ROCM_VERSION}. Supported: >= 5.3.0, <= 5.5.x"
-                    ;;
                 0.0)
                     ;;
                 *)
@@ -217,7 +214,7 @@ do
             esac
 
             # use Rocky Linux as a base image for RHEL builds
-            DISTRO_BASE_IMAGE=rockylinux
+            DISTRO_BASE_IMAGE=rockylinux/rockylinux
 
             verbose-build docker build . ${PULL} --progress plain -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO_BASE_IMAGE} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg AMDGPU_RPM=${ROCM_RPM} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\"
         elif [ "${DISTRO}" = "opensuse" ]; then
@@ -231,21 +228,9 @@ do
                     ;;
             esac
             case "${ROCM_VERSION}" in
-                5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*)
+                6.*)
                     ROCM_RPM=${ROCM_VERSION}/sle/${VERSION}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1.noarch.rpm
                     ;;
-                5.2 | 5.2.*)
-                    ROCM_RPM=22.20${ROCM_SEP}${ROCM_PATCH}/sle/${VERSION}/amdgpu-install-22.20.${ROCM_VERSN}-1.noarch.rpm
-                    ;;
-                5.1 | 5.1.*)
-                    ROCM_RPM=22.10${ROCM_SEP}${ROCM_PATCH}/sle/15/amdgpu-install-22.10${ROCM_SEP}${ROCM_PATCH}.${ROCM_VERSN}-1.noarch.rpm
-                    ;;
-                5.0 | 5.0.*)
-                    ROCM_RPM=21.50${ROCM_SEP}${ROCM_PATCH}/sle/15/amdgpu-install-21.50${ROCM_SEP}${ROCM_PATCH}.${ROCM_VERSN}-1.noarch.rpm
-                    ;;
-                4.5 | 4.5.*)
-                    ROCM_RPM=21.40${ROCM_SEP}${ROCM_PATCH}/sle/15/amdgpu-install-21.40${ROCM_SEP}${ROCM_PATCH}.${ROCM_VERSN}-1.noarch.rpm
-                    ;;
                 0.0)
                     ;;
                 *)
diff --git a/docker/test-docker-release.sh b/docker/test-docker-release.sh
index c57f68f5ae..ac1b7c3fa8 100755
--- a/docker/test-docker-release.sh
+++ b/docker/test-docker-release.sh
@@ -58,7 +58,7 @@ test-release()
     shift
     local DOCKER_ARGS=""
     tty -s && DOCKER_ARGS="-it" || DOCKER_ARGS=""
-    verbose-run docker run ${DOCKER_ARGS} --rm -v ${PWD}:/home/omnitrace ${CONTAINER} /home/omnitrace/scripts/test-release.sh ${@}
+    verbose-run docker run ${DOCKER_ARGS} --rm -v ${PWD}:/home/rocprofiler-systems ${CONTAINER} /home/rocprofiler-systems/scripts/test-release.sh ${@}
 }
 
 reset-last()
@@ -70,8 +70,8 @@ reset-last
 
 : ${USER:=$(whoami)}
 : ${DISTRO:=ubuntu}
-: ${VERSIONS:=20.04 18.04}
-: ${ROCM_VERSIONS:=5.0 4.5 4.3}
+: ${VERSIONS:=22.04 20.04}
+: ${ROCM_VERSIONS:=6.2}
 
 n=0
 while [[ $# -gt 0 ]]
@@ -121,6 +121,6 @@ do
     TAG=${DISTRO}-${VERSION}
     for ROCM_VERSION in ${ROCM_VERSIONS}
     do
-        test-release ${USER}/omnitrace:release-base-${TAG}-rocm-${ROCM_VERSION} ${SCRIPT_ARGS}
+        test-release ${USER}/rocprofiler-systems:release-base-${TAG}-rocm-${ROCM_VERSION} ${SCRIPT_ARGS}
     done
 done
diff --git a/scripts/build-release.sh b/scripts/build-release.sh
index 699736df75..e8f419aa9a 100755
--- a/scripts/build-release.sh
+++ b/scripts/build-release.sh
@@ -265,13 +265,13 @@ build-and-package-base()
                 DEST="stgz"
                 ;;
             DEB)
-                verbose-run cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/rocprof-sys
+                verbose-run cpack -G DEB -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/rocprofiler-systems
                 EXT="deb"
                 SEP="_"
                 DEST="deb"
                 ;;
             RPM)
-                verbose-run cpack -G RPM -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/rocprof-sys
+                verbose-run cpack -G RPM -D CPACK_PACKAGING_INSTALL_PREFIX=/opt/rocprofiler-systems
                 EXT="rpm"
                 SEP="-"
                 DEST="rpm"
@@ -325,7 +325,7 @@ build-and-package-base()
         esac
         popd
         verbose-run mkdir -p ${BUILD_DIR}/${DEST}
-        verbose-run copy-installer ${i} ${BUILD_DIR}/${DEST} ${BUILD_DIR}/${DIR}/omnitrace${SEP}${VERSION}-*.${EXT}
+        verbose-run copy-installer ${i} ${BUILD_DIR}/${DEST} ${BUILD_DIR}/${DIR}/rocprofiler-systems${SEP}${VERSION}-*.${EXT}
     done
 }
 
@@ -370,7 +370,7 @@ fi
 
 if [ "${IS_DOCKER}" -ne 0 ]; then git config --global --add safe.directory ${PWD}; fi
 
-verbose-run echo "Build omnitrace installers with generators: ${GENERATORS}"
+verbose-run echo "Build rocprofiler-systems installers with generators: ${GENERATORS}"
 
 build-and-package ${WITH_CORE} ${DISTRO}-core -DROCPROFSYS_USE_HIP=OFF -DROCPROFSYS_USE_MPI=OFF
 build-and-package ${WITH_MPI} ${DISTRO}-${MPI_IMPL} -DROCPROFSYS_USE_HIP=OFF -DROCPROFSYS_USE_MPI=ON
diff --git a/scripts/test-release.sh b/scripts/test-release.sh
index d47110b0ba..2dd4546496 100755
--- a/scripts/test-release.sh
+++ b/scripts/test-release.sh
@@ -107,10 +107,10 @@ test-install()
 change-directory()
 {
     if [ ! -f "${1}" ]; then
-        if [ -f "/home/omnitrace/${1}" ]; then
-            cd /home/omnitrace
-        elif [ -f "/home/omnitrace/docker/${1}" ]; then
-            cd /home/omnitrace/docker
+        if [ -f "/home/rocprofiler-systems/${1}" ]; then
+            cd /home/rocprofiler-systems
+        elif [ -f "/home/rocprofiler-systems/docker/${1}" ]; then
+            cd /home/rocprofiler-systems/docker
         fi
     fi
     realpath ${1}
@@ -121,12 +121,12 @@ test-stgz()
     if [ -z "${1}" ]; then return; fi
 
     local INSTALLER=$(change-directory ${1})
-    mkdir /opt/rocprof-sys-stgz
-    setup-env /opt/rocprof-sys-stgz
+    mkdir /opt/rocprofiler-systems-stgz
+    setup-env /opt/rocprofiler-systems-stgz
 
-    verbose-run ${INSTALLER} --prefix=/opt/rocprof-sys-stgz --skip-license --exclude-dir
+    verbose-run ${INSTALLER} --prefix=/opt/rocprofiler-systems-stgz --skip-license --exclude-dir
 
-    test-install /opt/rocprof-sys-stgz
+    test-install /opt/rocprofiler-systems-stgz
 }
 
 test-deb()
@@ -134,16 +134,16 @@ test-deb()
     if [ -z "${1}" ]; then return; fi
 
     local INSTALLER=$(change-directory ${1})
-    setup-env /opt/rocprof-sys
+    setup-env /opt/rocprofiler-systems
 
     verbose-run ${SUDO_CMD} dpkg --contents ${INSTALLER}
     verbose-run ${SUDO_CMD} dpkg -i ${INSTALLER}
 
-    test-install /opt/rocprof-sys
-    remove-pycache /opt/rocprof-sys
-    verbose-run apt-get remove -y rocprof-sys
-    if [ -d /opt/rocprof-sys ]; then
-        find /opt/rocprof-sys -type f
+    test-install /opt/rocprofiler-systems
+    remove-pycache /opt/rocprofiler-systems
+    verbose-run apt-get remove -y rocprofiler-systems
+    if [ -d /opt/rocprofiler-systems ]; then
+        find /opt/rocprofiler-systems -type f
     fi
 }
 
@@ -152,16 +152,16 @@ test-rpm()
     if [ -z "${1}" ]; then return; fi
 
     local INSTALLER=$(change-directory ${1})
-    setup-env /opt/rocprof-sys
+    setup-env /opt/rocprofiler-systems
 
     verbose-run ${SUDO_CMD} rpm -ql -p ${INSTALLER}
     verbose-run ${SUDO_CMD} rpm -v -i -p ${INSTALLER} --nodeps
 
-    test-install /opt/rocprof-sys
-    remove-pycache /opt/rocprof-sys
-    verbose-run rpm -e rocprof-sys
-    if [ -d /opt/rocprof-sys ]; then
-        find /opt/rocprof-sys -type f
+    test-install /opt/rocprofiler-systems
+    remove-pycache /opt/rocprofiler-systems
+    verbose-run rpm -e rocprofiler-systems
+    if [ -d /opt/rocprofiler-systems ]; then
+        find /opt/rocprofiler-systems -type f
     fi
 }