diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
index ad9daba..11849f2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican runtest artifactory)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index 9e9d3be..368b52b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -35,7 +35,6 @@
 - system.reclass.storage.system.openstack_share_single
 - system.reclass.storage.system.openstack_telemetry_cluster
 - cluster.virtual-mcp-pike-dvr-ssl-barbican
-- service.runtest.tempest
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -47,10 +46,6 @@
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
-    runtest_tempest_cfg_dir: /root/rally_reports/
-    runtest_tempest_cfg_name: tempest_generated.conf
-    artifactory_user: artifactory_user
-    artifactory_password: artifactory_password
   linux:
     network:
       interface:
@@ -71,9 +66,6 @@
             dogtag:
               source: pkg
               name: salt-formula-dogtag
-  neutron:
-    client:
-      enabled: true
   reclass:
     storage:
       class_mapping:
@@ -220,46 +212,3 @@
         openstack_telemetry_node03:
           params:
             redis_cluster_role: 'slave'
-  runtest:
-    enabled: True
-    test_target: gtw0*
-    keystonerc_node: ctl01*
-    tempest:
-      enabled: True
-      cfg_dir: ${_param:runtest_tempest_cfg_dir}
-      cfg_name: ${_param:runtest_tempest_cfg_name}
-      DEFAULT:
-        log_file: /home/rally/rally_reports/tempest.log
-      compute:
-        build_timeout: 600
-        min_microversion: 2.1
-        max_microversion: 2.42
-      orchestration:
-        max_template_size: 5440000
-        max_resources_per_stack: 20000
-      dns_feature_enabled:
-        # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
-        # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
-        api_admin: false
-        api_v1: false
-        api_v2: true
-        api_v2_quotas: true
-        api_v2_root_recordsets: true
-        bug_1573141_fixed: true
-      volume-feature-enabled:
-        backup: false
-    artifact_collector:
-      enabled: true
-      artifactory:
-       enabled: true
-       user: ${_param:artifactory_user}
-       password: ${_param:artifactory_password}
-       host: artifactory.mcp.mirantis.net
-       port: 443
-       proto: https
-       endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
-      artifacts:
-        sys_logs:
-          path: /var/log
-        etc:
-          path: /etc