diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml
index d9a26bfb535d9b19cd1189c6c9c126efff462471..6e6d0ef973bc81a94cfcf06b2968dd2bedf4ad7e 100644
--- a/.ostc-ci/machines-and-flavours.yaml
+++ b/.ostc-ci/machines-and-flavours.yaml
@@ -130,6 +130,7 @@ blueprint-smartpanel-zephyr:
 
 blueprint-smartpanel-linux:
   extends: .build-linux
+  tags: [large-disk, bitbake-friendly, heavy]
   variables:
     MACHINE: stm32mp1-av96
     DISTRO: allscenarios-linux-blueprint-dashboard
@@ -137,6 +138,7 @@ blueprint-smartpanel-linux:
 
 blueprint-gateway-linux:
   extends: .build-linux
+  tags: [large-disk, bitbake-friendly, heavy]
   variables:
     MACHINE: raspberrypi4-64
     DISTRO: allscenarios-linux-blueprint-gateway