diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/% b/qa/cephfs/mount/kclient/overrides/distro/stock/%
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/random/%
rename to qa/cephfs/mount/kclient/overrides/distro/stock/%
diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/.qa b/qa/cephfs/mount/kclient/overrides/distro/stock/.qa
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/random/.qa
rename to qa/cephfs/mount/kclient/overrides/distro/stock/.qa
diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/k-distro.yaml b/qa/cephfs/mount/kclient/overrides/distro/stock/k-stock.yaml
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/rhel/k-distro.yaml
rename to qa/cephfs/mount/kclient/overrides/distro/stock/k-stock.yaml
diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/rhel_8.yaml b/qa/cephfs/mount/kclient/overrides/distro/stock/rhel_8.yaml
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/rhel/rhel_8.yaml
rename to qa/cephfs/mount/kclient/overrides/distro/stock/rhel_8.yaml
diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/% b/qa/cephfs/mount/kclient/overrides/distro/testing/%
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/rhel/%
rename to qa/cephfs/mount/kclient/overrides/distro/testing/%
diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/supported/.qa b/qa/cephfs/mount/kclient/overrides/distro/testing/.qa
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/random/supported/.qa
rename to qa/cephfs/mount/kclient/overrides/distro/testing/.qa
diff --git a/qa/cephfs/mount/kclient/overrides/distro/rhel/.qa b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/rhel/.qa
rename to qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa
diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/supported/centos_latest.yaml b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/centos_latest.yaml
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/random/supported/centos_latest.yaml
rename to qa/cephfs/mount/kclient/overrides/distro/testing/flavor/centos_latest.yaml
diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/supported/ubuntu_latest.yaml b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/random/supported/ubuntu_latest.yaml
rename to qa/cephfs/mount/kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml
diff --git a/qa/cephfs/mount/kclient/overrides/distro/random/k-testing.yaml b/qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml
similarity index 100%
rename from qa/cephfs/mount/kclient/overrides/distro/random/k-testing.yaml
rename to qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml