diff --git a/.github/workflows/build-with-kokkos.yml b/.github/workflows/build-with-kokkos.yml
index f9c90e17d..7da5530a6 100644
--- a/.github/workflows/build-with-kokkos.yml
+++ b/.github/workflows/build-with-kokkos.yml
@@ -71,12 +71,13 @@ jobs:
                   exit -1
           esac
 
-      - name: Install CMake, OpenMPI and dtrace
+      - name: Install CMake, OpenMPI, PAPI and dtrace
         run: |
           apt --yes --no-install-recommends install \
             cmake make \
             libopenmpi-dev \
-            systemtap-sdt-dev
+            systemtap-sdt-dev \
+            libpapi-dev
       - name: Compile and install Kokkos
         working-directory: kokkos
         run: |
diff --git a/CMakePresets.json b/CMakePresets.json
index 34fd2665a..667854c95 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -9,7 +9,8 @@
                 "CMAKE_CXX_STANDARD"                : "17",
                 "KokkosTools_ENABLE_EXAMPLES"       : "ON",
                 "KokkosTools_ENABLE_SINGLE"         : "ON",
-                "KokkosTools_ENABLE_MPI"            : "ON"
+                "KokkosTools_ENABLE_MPI"            : "ON",
+                "KokkosTools_ENABLE_PAPI"           : "ON"
             }
         },
         {
diff --git a/profiling/papi-connector/CMakeLists.txt b/profiling/papi-connector/CMakeLists.txt
index 478e996b1..961b4be95 100644
--- a/profiling/papi-connector/CMakeLists.txt
+++ b/profiling/papi-connector/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(kp_papi_connector SHARED kp_papi_connector.cpp)
+kp_add_library(kp_papi_connector kp_papi_connector.cpp)
 
-target_link_libraries(kp_papi_connector PRIVATE PAPI::PAPI)
\ No newline at end of file
+target_link_libraries(kp_papi_connector PRIVATE PAPI::PAPI)