diff --git a/samples/keys/hw_unique_key/sample.yaml b/samples/keys/hw_unique_key/sample.yaml
index ccf38216e64..3b2014ee696 100644
--- a/samples/keys/hw_unique_key/sample.yaml
+++ b/samples/keys/hw_unique_key/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: Generate and write random keys to the KMU.
   name: Random HW Unique Key
 common:
-  tags: huk
+  tags: huk keys
   platform_allow:
     - nrf5340dk/nrf5340/cpuapp
     - nrf5340dk/nrf5340/cpuapp/ns
@@ -35,4 +35,4 @@ common:
 tests:
   sample.keys.hw_unique_key:
     sysbuild: true
-    tags: huk ci_build sysbuild
+    tags: huk ci_build sysbuild keys
diff --git a/scripts/ci/tags.yaml b/scripts/ci/tags.yaml
index d8c900791a4..346f8edca79 100644
--- a/scripts/ci/tags.yaml
+++ b/scripts/ci/tags.yaml
@@ -516,3 +516,21 @@ peripheral_802154:
     - nrfxlib/nrf_rpc/
     - zephyr/modules/hal_nordic/nrf_802154/
     - zephyr/soc/nordic/
+
+keys:
+  files:
+    - modules/crypto/mbedtls/
+    - modules/crypto/oberon-psa-crypto/
+    - nrf/drivers/hw_cc3xx/
+    - nrf/lib/fprotect/
+    - nrf/lib/hw_unique_key/
+    - nrf/lib/identity_key/
+    - nrf/lib/modem_antenna/
+    - nrf/lib/nrf_modem_lib/
+    - nrf/samples/keys/
+    - nrf/subsys/fw_info/
+    - nrf/subsys/nrf_security/
+    - nrf/subsys/partition_manager/
+    - nrfxlib/crypto/
+    - nrfxlib/nrf_modem/
+    - zephyr/soc/nordic/