diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 7204112ad5..ad1da24ad9 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: ['navi3', 'vega20', 'mi200', 'mi300']
+        runner: ['mi200', 'mi300']
         os: ['ubuntu-22.04']
         build-type: ['RelWithDebInfo']
         ci-flags: ['--linter clang-tidy']
@@ -41,7 +41,7 @@ jobs:
     # define this for containers
     env:
       GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-      CORE_EXT_RUNNER: navi3
+      CORE_EXT_RUNNER: mi200
 
     steps:
     - uses: actions/checkout@v4
@@ -511,17 +511,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: ['navi3', 'vega20', 'mi300']
+        runner: ['mi200', 'mi300']
         sanitizer: ['AddressSanitizer', 'ThreadSanitizer', 'LeakSanitizer']
         os: ['ubuntu-22.04']
         build-type: ['RelWithDebInfo']
         exclude:
-          - { runner: 'navi3',  sanitizer: 'ThreadSanitizer' }
-          - { runner: 'navi3',  sanitizer: 'LeakSanitizer' }
-          - { runner: 'vega20', sanitizer: 'AddressSanitizer' }
-          - { runner: 'vega20', sanitizer: 'LeakSanitizer' }
-          - { runner: 'mi300',  sanitizer: 'AddressSanitizer' }
-          - { runner: 'mi300',  sanitizer: 'ThreadSanitizer' }
+        #   - { runner: 'navi3',  sanitizer: 'ThreadSanitizer' }
+        #   - { runner: 'navi3',  sanitizer: 'LeakSanitizer' }
+        #   - { runner: 'vega20', sanitizer: 'AddressSanitizer' }
+        #   - { runner: 'vega20', sanitizer: 'LeakSanitizer' }
+          - { runner: 'mi200', sanitizer: 'LeakSanitizer' }
+          - { runner: 'mi200', sanitizer: 'AddressSanitizer' }
+        #   - { runner: 'mi300',  sanitizer: 'AddressSanitizer' }
+          - { runner: 'mi300', sanitizer: 'ThreadSanitizer' }
 
     if: ${{ contains(github.event_name, 'pull_request') }}
     runs-on: ${{ matrix.runner }}-runner-set
diff --git a/tests/pc_sampling/CMakeLists.txt b/tests/pc_sampling/CMakeLists.txt
index d1466591cb..3ab060b00a 100644
--- a/tests/pc_sampling/CMakeLists.txt
+++ b/tests/pc_sampling/CMakeLists.txt
@@ -116,22 +116,17 @@ target_link_libraries(
     PRIVATE pc-sampling-integration-test-client Threads::Threads
             rocprofiler-sdk::tests-build-flags)
 
-# rocprofiler_pc-sampling-integration_get_preload_env(PRELOAD_ENV
-# pc-sampling-integration-test-client)
-# rocprofiler_pc-sampling-integration_get_ld_library_path_env(LIBRARY_PATH_ENV)
-
-# set(pc-sampling-integration-test-env ${PRELOAD_ENV} ${LIBRARY_PATH_ENV})
-
 add_test(NAME pc-sampling-integration-test
          COMMAND $<TARGET_FILE:pc-sampling-integration-test>)
 
+set(pc-sampling-integration-test-env "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}")
+
 set_tests_properties(
     pc-sampling-integration-test
     PROPERTIES TIMEOUT
                45
                LABELS
                "integration-tests;pc-sampling"
-               # ENVIRONMENT "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}"
                SKIP_REGULAR_EXPRESSION
                "PC sampling unavailable"
                ENVIRONMENT