diff --git a/.buildkite/pipelines/scheduled/no_bb/no_bb_package_linux.arches b/.buildkite/pipelines/scheduled/no_bb/no_bb_package_linux.arches
index b2e6856c02af5..092c505910d89 100644
--- a/.buildkite/pipelines/scheduled/no_bb/no_bb_package_linux.arches
+++ b/.buildkite/pipelines/scheduled/no_bb/no_bb_package_linux.arches
@@ -1,2 +1,2 @@
-# PLATFORM    LABEL       ALLOW_FAIL    ARCH        ARCH_ROOTFS    GROUP    MAKE_FLAGS             TIMEOUT_BK    TIMEOUT_RR     RETRIES    IS_RR    IS_ST    IS_MT    ROOTFS_TAG    ROOTFS_HASH
-linux         64_no_bb    false         64_no_bb    x86_64         .        USE_BINARYBUILDER=0    180           .              .          .        .        .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+# PLATFORM    LABEL       GROUP    ALLOW_FAIL    ARCH        ARCH_ROOTFS    MAKE_FLAGS             TIMEOUT_BK    TIMEOUT_RR     RETRIES    IS_RR    IS_ST    IS_MT    ROOTFS_TAG    ROOTFS_HASH
+linux         64_src      .        .             64_src      x86_64         USE_BINARYBUILDER=0    180           .              .          .        .        .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
diff --git a/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches b/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches
index d9098511d59ed..b59221c1b83c1 100644
--- a/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches
+++ b/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches
@@ -1,10 +1,10 @@
-# PLATFORM    LABEL               GROUP    ALLOW_FAIL    ARCH        ARCH_ROOTFS    MAKE_FLAGS     TIMEOUT_BK    TIMEOUT_RR     RETRIES    IS_RR    IS_ST    IS_MT    ROOTFS_TAG    ROOTFS_HASH
-linux         64_no_bb_g1_mt      g1       .             64_no_bb    x86_64         .              .             .              .          .        .        yes      v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
-linux         64_no_bb_g2_mt      g2       .             64_no_bb    x86_64         .              .             .              3          .        .        yes      v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+# PLATFORM    LABEL            GROUP    ALLOW_FAIL    ARCH     ARCH_ROOTFS    MAKE_FLAGS     TIMEOUT_BK    TIMEOUT_RR     RETRIES    IS_RR    IS_ST    IS_MT    ROOTFS_TAG    ROOTFS_HASH
+linux         64src_g1_mt      g1       .             64src    x86_64         .              .             .              .          .        .        yes      v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+linux         64src_g2_mt      g2       .             64src    x86_64         .              .             .              3          .        .        yes      v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
 
-linux         64_no_bb_g1_st      g1       .             64_no_bb    x86_64         .              .             .              .          .        yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
-linux         64_no_bb_g2_st      g2       .             64_no_bb    x86_64         .              .             .              3          .        yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+linux         64src_g1_st      g1       .             64src    x86_64         .              .             .              .          .        yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+linux         64src_g2_st      g2       .             64src    x86_64         .              .             .              3          .        yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
 
-linux         64_no_bb_g1_rrst    g1       .             64_no_bb    x86_64         .              180           120            .          yes      yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
-linux         64_no_bb_g2_rrst    g2       .             64_no_bb    x86_64         .              120           60             3          yes      yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
-linux         64_no_bb_g3_st      g3       .             64_no_bb    x86_64         .              .             .              3          .        yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+linux         64src_g1_rrst    g1       .             64src    x86_64         .              180           120            .          yes      yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+linux         64src_g2_rrst    g2       .             64src    x86_64         .              120           60             3          yes      yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a
+linux         64src_g3_st      g3       .             64src    x86_64         .              .             .              3          .        yes      .        v4.8          2a058481b567f0e91b9aa3ce4ad4f09e6419355a