diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 75d7a39eb6..0ac63f2068 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -29,8 +29,23 @@ EXTRA_OECMAKE += "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON"
 # This needs to be specified explicitly to avoid xcb/xlib dependencies
 EXTRA_OECMAKE += "-DVKB_WSI_SELECTION=D2D"
 
+# Disable ray_tracing_position_fetch sample compilation by default,
+# as it uses pica_pica_robot which is under CC-BY-NC-4.0 license
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[pica_pica_robot] = "-DVKB_ray_tracing_position_fetch=ON,-DVKB_ray_tracing_position_fetch=OFF"
+
 # Clang is fussy about incompatible options on aarch64/x86_64
 # x86_64-poky-linux-clang++: error: overriding '-ffp-model=precise' option with '-ffp-contract=fast' [-Werror,-Woverriding-option]
 CXXFLAGS:append:toolchain-clang = " -Wno-error=overriding-option"
 
 COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
+
+do_install:append() {
+    install -d ${D}${bindir}
+    install -m 0755 ${B}/app/bin/${TARGET_ARCH}/vulkan_samples ${D}${bindir}/
+    cp --no-preserve=ownership -r ${S}/assets ${D}${bindir}/
+    cp --no-preserve=ownership -r ${S}/shaders ${D}${bindir}/
+    if ! ${@bb.utils.contains('PACKAGECONFIG', 'pica_pica_robot', 'true', 'false', d)}; then
+        rm -rf ${D}${bindir}/assets/scenes/pica_pica_robot
+    fi
+}