diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index 04d4bf9..7336299 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -138,13 +138,13 @@ def add_access_protocol(ctxt):
 def get_tempest_context():
     keystone_session = openstack_utils.get_overcloud_keystone_session()
     ctxt = {}
-    add_application_ips(ctxt)
-    add_nova_config(ctxt, keystone_session)
-    add_neutron_config(ctxt, keystone_session)
-    add_glance_config(ctxt, keystone_session)
-    add_keystone_config(ctxt, keystone_session)
-    add_environment_var_config(ctxt)
-    add_access_protocol(ctxt)
+    #add_application_ips(ctxt)
+    #add_nova_config(ctxt, keystone_session)
+    #add_neutron_config(ctxt, keystone_session)
+    #add_glance_config(ctxt, keystone_session)
+    #add_keystone_config(ctxt, keystone_session)
+    #add_environment_var_config(ctxt)
+    #add_access_protocol(ctxt)
     return ctxt
 
 
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
index ec95577..aa6b555 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
@@ -1,97 +1,3 @@
 file_contents = """
 [DEFAULT]
-debug = false
-use_stderr = false
-log_file = tempest.log
-
-[auth]
-test_accounts_file = accounts.yaml
-default_credentials_domain_name = Default
-admin_username = {admin_username}
-admin_project_name = admin
-admin_password = {admin_password}
-admin_domain_name = Default
-
-[compute]
-image_ref = {image_id}
-image_ref_alt = {image_alt_id}
-flavor_ref = {flavor_ref}
-flavor_ref_alt = {flavor_ref_alt}
-region = RegionOne
-min_compute_nodes = 3
-
-# TODO: review this as its release specific
-# min_microversion = 2.2
-# max_microversion = latest
-
-[compute-feature-enabled]
-console_output = true
-resize = true
-live_migration = true
-block_migration_for_live_migration = true
-attach_encrypted_volume = false
-
-[identity]
-uri = {proto}://{keystone}:5000/v2.0
-auth_version = v2
-admin_role = Admin
-region = RegionOne
-
-[identity-feature-enabled]
-api_v2 = true
-api_v3 = false
-
-[image]
-http_image = http://{os_test_swift_ip}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz
-
-[network]
-project_network_cidr = {os_test_cidr_priv}
-public_network_id = {ext_net}
-dns_servers = {os_test_nameserver}
-project_networks_reachable = false
-
-[network-feature-enabled]
-ipv6 = false
-
-[orchestration]
-stack_owner_role = Admin
-instance_type = m1.small
-keypair_name = testkey
-
-[oslo_concurrency]
-lock_path = /tmp
-
-[scenario]
-img_dir = /home/ubuntu/images
-img_file = cirros-0.3.4-x86_64-disk.img
-img_container_format = bare
-img_disk_format = qcow2
-
-[validation]
-run_validation = true
-image_ssh_user = cirros
-
-[service_available]
-ceilometer = true
-cinder = true
-glance = true
-heat = true
-horizon = true
-ironic = false
-neutron = true
-nova = true
-sahara = false
-swift = true
-trove = false
-zaqar = false
-
-[volume]
-backend_names = cinder-ceph
-storage_protocol = ceph
-# NOTE(coreycb): Need to enalbe catalog_type, determined by:
-# volume_version=$(openstack endpoint list -c 'Service Type' -f value | grep -m 1 volumev3 ||
-#                  openstack endpoint list -c 'Service Type' -f value | grep -m 1 volumev2)
-# catalog_type = __VOLUME_VERSION__
-
-[volume-feature-enabled]
-backup = false"""
+debug = false"""
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
index 887b0b5..aa6b555 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
@@ -1,95 +1,3 @@
 file_contents = """
 [DEFAULT]
-debug = false
-use_stderr = false
-log_file = tempest.log
-
-[auth]
-test_accounts_file = accounts.yaml
-default_credentials_domain_name = {default_credentials_domain_name}
-admin_username = {admin_username}
-admin_project_name = {admin_project_name}
-admin_password = {admin_password}
-admin_domain_name = {admin_domain_name}
-
-[compute]
-image_ref = {image_id}
-image_ref_alt = {image_alt_id}
-flavor_ref = {flavor_ref}
-flavor_ref_alt = {flavor_ref_alt}
-min_compute_nodes = 3
-
-# TODO: review this as its release specific
-# min_microversion = 2.2
-# max_microversion = latest
-
-[compute-feature-enabled]
-console_output = true
-resize = true
-live_migration = true
-block_migration_for_live_migration = true
-attach_encrypted_volume = false
-
-[identity]
-uri = {proto}://{keystone}:5000/v2.0
-uri_v3 = {proto}://{keystone}:5000/v3
-auth_version = v3
-admin_role = Admin
-region = RegionOne
-default_domain_id = {default_domain_id}
-admin_domain_scope = true
-
-[identity-feature-enabled]
-api_v2 = false
-api_v3 = true
-
-[image]
-http_image = http://{os_test_swift_ip}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz
-
-[network]
-project_network_cidr = {os_test_cidr_priv}
-public_network_id = {ext_net}
-dns_servers = {os_test_nameserver}
-project_networks_reachable = false
-
-[network-feature-enabled]
-ipv6 = false
-
-[orchestration]
-stack_owner_role = Admin
-instance_type = m1.small
-keypair_name = testkey
-
-[oslo_concurrency]
-lock_path = /tmp
-
-[scenario]
-img_dir = /home/ubuntu/images
-img_file = cirros-0.3.4-x86_64-disk.img
-img_container_format = bare
-img_disk_format = qcow2
-
-[validation]
-run_validation = true
-image_ssh_user = cirros
-
-[service_available]
-ceilometer = true
-cinder = true
-glance = true
-heat = true
-horizon = true
-ironic = false
-neutron = true
-nova = true
-sahara = false
-swift = true
-trove = false
-zaqar = false
-
-[volume]
-backend_names = cinder-ceph
-storage_protocol = ceph
-
-[volume-feature-enabled]
-backup = false"""
+debug = false"""