diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml
deleted file mode 100644
index 9dfcc7f6bb1..00000000000
--- a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: centos
-os_version: "7.3"
diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml
new file mode 120000
index 00000000000..b5973b95278
--- /dev/null
+++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml
deleted file mode 100644
index a459fddffb2..00000000000
--- a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "16.04"
diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml
new file mode 120000
index 00000000000..cc5b15bccc7
--- /dev/null
+++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml
index 1b32b4aebde..bb9c57ee238 100644
--- a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml
@@ -8,6 +8,9 @@ overrides:
           global:
             osd default pool size: 2
             mon pg warn min per osd: 2
+            osd pool default pg num: 64
+            osd pool default pgp num: 64
+            mon_max_pg_per_osd: 1024
         ceph_test: true
         ceph_stable_release: luminous
         osd_scenario: collocated
@@ -15,6 +18,11 @@ overrides:
         osd_auto_discovery: false
         ceph_origin: repository
         ceph_repository: dev
+        cephfs_pools:
+          - name: "cephfs_data"
+            pgs: "64"
+          - name: "cephfs_metadata"
+            pgs: "64"
 tasks:
 - ssh-keys:
 - ceph_ansible: