diff --git a/BUILD_TOPOLOGY.toml b/BUILD_TOPOLOGY.toml
index 4115dad57f7..44cc84d6318 100644
--- a/BUILD_TOPOLOGY.toml
+++ b/BUILD_TOPOLOGY.toml
@@ -578,6 +578,13 @@ feature_group = "CORE"  # Part of core, enabled by default
 test_artifacts = ["core-hiptests"]  # When building HIP, also build hip-tests
 source_paths = ["clr", "hip", "amdgpu-windows-interop"]
 
+[artifacts.core-hrr]
+artifact_group = "hip-runtime"
+type = "target-neutral"
+artifact_deps = ["core-hip"]
+source_paths = ["hrr"]
+feature_group = "CORE"  # Part of core, enabled by default
+
 [artifacts.core-ocl-icd]
 artifact_group = "opencl-runtime"
 type = "target-neutral"
@@ -619,7 +626,7 @@ feature_group = "CORE"  # Part of core, enabled by default
 [artifacts.core-hiptests]
 artifact_group = "runtime-tests"
 type = "target-neutral"
-artifact_deps = ["core-hip"]
+artifact_deps = ["core-hip", "core-hrr"]
 feature_group = "CORE"  # Part of core, enabled by default
 source_paths = ["hip-tests"]
 
@@ -895,7 +902,7 @@ disable_platforms = ["windows"]
 [artifacts.rocjitsu]
 artifact_group = "rocjitsu"
 type = "target-neutral"
-artifact_deps = []
+artifact_deps = ["base", "sysdeps"]
 feature_group = "EMULATION"
 disable_platforms = ["windows"]
 source_paths = ["rocjitsu", "machine-readable-isa"]
@@ -910,6 +917,6 @@ disable_platforms = ["windows"]
 [artifacts.mirage]
 artifact_group = "rocjitsu"
 type = "target-neutral"
-artifact_deps = []
+artifact_deps = ["base", "sysdeps"]
 feature_group = "EMULATION"
 disable_platforms = ["windows"]
diff --git a/build_tools/packaging/linux/package.json b/build_tools/packaging/linux/package.json
index 9eb53e052f2..581c0d0c439 100644
--- a/build_tools/packaging/linux/package.json
+++ b/build_tools/packaging/linux/package.json
@@ -248,6 +248,18 @@
           }
         ]
       },
+      {
+        "Artifact": "core-hrr",
+        "Artifact_Subdir": [
+          {
+            "Name": "hrr",
+            "Components": [
+              "doc",
+              "run"
+            ]
+          }
+        ]
+      },
       {
         "Artifact": "amd-llvm",
         "Artifact_Subdir": [
@@ -324,6 +336,18 @@
           }
         ]
       },
+      {
+        "Artifact": "core-hrr",
+        "Artifact_Subdir": [
+          {
+            "Name": "hrr",
+            "Components": [
+              "dev",
+              "doc"
+            ]
+          }
+        ]
+      },
       {
         "Artifact": "core-kpack",
         "Artifact_Subdir": [
@@ -401,6 +425,18 @@
           }
         ]
       },
+      {
+        "Artifact": "core-hrr",
+        "Artifact_Subdir": [
+          {
+            "Name": "hrr",
+            "Components": [
+              "lib",
+              "test"
+            ]
+          }
+        ]
+      },
       {
         "Artifact": "rocrtst",
         "Artifact_Subdir": [
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 00d9bd0dd54..00361d93439 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -349,6 +349,58 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
       libhiprtc-builtins.so
       libhiprtc.so
   )
+
+  if(THEROCK_ENABLE_CORE_HRR)
+    ##############################################################################
+    # hrr
+    ##############################################################################
+
+    set(HRR_BUILD_DEPS rocm-cmake)
+    if(THEROCK_BUILD_TESTING)
+      list(APPEND HRR_BUILD_DEPS therock-catch2)
+    endif()
+
+    therock_cmake_subproject_declare(hrr
+      USE_DIST_AMDGPU_TARGETS
+      EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hrr"
+      BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/hrr"
+      INTERFACE_PROGRAM_DIRS
+        bin
+      BACKGROUND_BUILD
+      COMPILER_TOOLCHAIN
+        amd-hip
+      CMAKE_ARGS
+        "-DHRR_BUILD_PLAYBACK=ON"
+        "-DHRR_BUILD_TESTS=${THEROCK_BUILD_TESTING}"
+        "-DHRR_BUILD_INTEGRATION_TESTS=${THEROCK_BUILD_TESTING}"
+        "-DHIP_PLATFORM=amd"
+      BUILD_DEPS
+        ${HRR_BUILD_DEPS}
+      RUNTIME_DEPS
+        hip-clr
+      INTERFACE_LINK_DIRS
+        "lib"
+      INTERFACE_INSTALL_RPATH_DIRS
+        "lib"
+    )
+    therock_cmake_subproject_glob_c_sources(hrr SUBDIRS .)
+    therock_cmake_subproject_activate(hrr)
+
+    therock_provide_artifact(core-hrr
+      TARGET_NEUTRAL
+      DESCRIPTOR artifact-core-hrr.toml
+      COMPONENTS
+        dbg
+        dev
+        doc
+        lib
+        run
+        test
+      SUBPROJECT_DEPS
+        hrr
+    )
+  endif()
+
   if(WIN32)
     ##############################################################################
     # hipInfo (from hip-tests)
@@ -574,6 +626,10 @@ endif(THEROCK_ENABLE_OCL_RUNTIME)
 
 if(THEROCK_BUILD_TESTING AND THEROCK_ENABLE_CORE_HIPTESTS)
   set(HIP_TESTS_CMAKE_ARGS)
+  set(HIP_TESTS_RUNTIME_DEPS)
+  if(THEROCK_ENABLE_CORE_HRR)
+    list(APPEND HIP_TESTS_RUNTIME_DEPS hrr)
+  endif()
   set(_hip_tests_subproject_names)
   therock_cmake_subproject_declare(hip-tests
     USE_TEST_AMDGPU_TARGETS
@@ -590,6 +646,7 @@ if(THEROCK_BUILD_TESTING AND THEROCK_ENABLE_CORE_HIPTESTS)
       therock-catch2
     RUNTIME_DEPS
       hip-clr
+      ${HIP_TESTS_RUNTIME_DEPS}
       ${THEROCK_BUNDLED_NUMACTL}
     INTERFACE_LINK_DIRS
       lib
diff --git a/core/artifact-core-hrr.toml b/core/artifact-core-hrr.toml
new file mode 100644
index 00000000000..362ed12fe82
--- /dev/null
+++ b/core/artifact-core-hrr.toml
@@ -0,0 +1,16 @@
+# hrr
+[components.run."core/hrr/stage"]
+include = [
+  "bin/**",
+]
+[components.dbg."core/hrr/stage"]
+[components.lib."core/hrr/stage"]
+[components.dev."core/hrr/stage"]
+include = [
+  "include/hrr/**",
+]
+[components.doc."core/hrr/stage"]
+[components.test."core/hrr/stage"]
+include = [
+  "share/hrr/**",
+]
diff --git a/test_tools/therock_consumer_graph.json b/test_tools/therock_consumer_graph.json
index 5c30b9009f1..21dfa7de9d1 100644
--- a/test_tools/therock_consumer_graph.json
+++ b/test_tools/therock_consumer_graph.json
@@ -90,6 +90,7 @@
       "hipsparselt",
       "hiptensor",
       "hipthreads",
+      "hrr",
       "libhipcxx",
       "miopen",
       "miopenprovider",
@@ -337,6 +338,7 @@
       "hipsparselt",
       "hiptensor",
       "hipthreads",
+      "hrr",
       "libhipcxx",
       "miopen",
       "ocl-clr",
@@ -549,6 +551,7 @@
   "therock-catch2": {
     "consumers": [
       "hip-tests",
+      "hrr",
       "origami",
       "rocroller"
     ]
@@ -859,5 +862,10 @@
       "rocr-runtime",
       "therock-elfutils"
     ]
+  },
+  "hrr": {
+    "consumers": [
+      "hip-tests"
+    ]
   }
 }