diff --git a/tox-podman.ini b/tox-podman.ini
index 19186cd23..d1f6137a8 100644
--- a/tox-podman.ini
+++ b/tox-podman.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = nautilus-centos-container-podman
+envlist = centos-container-podman
 
 skipsdist = True
 
diff --git a/tox-update.ini b/tox-update.ini
index e4c2353b0..edde172f4 100644
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = nautilus-{centos,ubuntu}-{container,non_container}-update
+envlist = {centos,ubuntu}-{container,non_container}-update
 
 skipsdist = True
 
diff --git a/tox.ini b/tox.ini
index 86b5fc014..d8296c53d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
-envlist = {nautilus,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
-  {nautilus,rhcs}-{centos,ubuntu}-container-{ooo_collocation}
-  {nautilus,rhcs}-{centos,ubuntu}-non_container-{switch_to_containers}
+envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
+  {centos,ubuntu}-container-{ooo_collocation}
+  {centos,ubuntu}-non_container-{switch_to_containers}
   infra_lv_create
   migrate_ceph_disk_to_ceph_volume
 
@@ -380,14 +380,12 @@ setenv=
   shrink_mon: MON_TO_KILL = mon2
   shrink_mgr: MGR_TO_KILL = mgr1
 
-  rhcs: CEPH_STABLE_RELEASE = luminous
   lvm_osds: CEPH_STABLE_RELEASE = nautilus
 
-  rhcs: CEPH_STABLE_RELEASE = luminous
-  nautilus: CEPH_DOCKER_IMAGE_TAG = latest-nautilus
-  nautilus: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus
-  nautilus: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus
-  nautilus: CEPH_STABLE_RELEASE = nautilus
+  CEPH_DOCKER_IMAGE_TAG = latest-nautilus
+  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus
+  CEPH_STABLE_RELEASE = nautilus
 
   ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
 deps= -r{toxinidir}/tests/requirements.txt
@@ -419,16 +417,12 @@ changedir=
   lvm_auto_discovery: {toxinidir}/tests/functional/lvm-auto-discovery{env:CONTAINER_DIR:}
 
 commands=
-  rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
-
   vagrant up --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
   # configure lvm
   !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
 
-  rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"
-
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\