diff --git a/playbooks/baremetal-full-overcloud-validate.yml b/playbooks/baremetal-full-overcloud-validate.yml
index e57fca205..686d548f1 100644
--- a/playbooks/baremetal-full-overcloud-validate.yml
+++ b/playbooks/baremetal-full-overcloud-validate.yml
@@ -44,6 +44,9 @@
       vars:
         tempest_install_method: distro
         tempest_cloud_name: 'overcloud'
+  environment:
+    # Disable ssl waarnings
+    CURL_CA_BUNDLE: ""
   tags:
     - overcloud-validate
 
diff --git a/playbooks/multinode-standalone-upgrade.yml b/playbooks/multinode-standalone-upgrade.yml
index af45a0293..119d8c9b2 100644
--- a/playbooks/multinode-standalone-upgrade.yml
+++ b/playbooks/multinode-standalone-upgrade.yml
@@ -106,5 +106,8 @@
     tempest_cidr: '192.168.24.0/24'
   tasks:
     - include_tasks: tasks/tempest.yml
+  environment:
+    # Disable ssl warnings
+    CURL_CA_BUNDLE: ""
   tags:
     - standalone-upgrade
diff --git a/playbooks/multinode-standalone.yml b/playbooks/multinode-standalone.yml
index cfc26bbb9..57f9c2931 100644
--- a/playbooks/multinode-standalone.yml
+++ b/playbooks/multinode-standalone.yml
@@ -68,5 +68,8 @@
     - include_tasks: tasks/tempest.yml
       when: job is undefined or (job is defined and
             job.featureset is defined and job.featureset != '056')
+  environment:
+    # Disable ssl warnings
+    CURL_CA_BUNDLE: ""
   tags:
     - standalone
diff --git a/playbooks/multinode-validate.yml b/playbooks/multinode-validate.yml
index cc6e5b711..55fa413ed 100644
--- a/playbooks/multinode-validate.yml
+++ b/playbooks/multinode-validate.yml
@@ -30,6 +30,9 @@
     tempest_cidr: '192.168.24.0/24'
   tasks:
     - include_tasks: tasks/tempest.yml
+  environment:
+    # Disable ssl waarnings
+    CURL_CA_BUNDLE: ""
   tags:
     - overcloud-validate
     - undercloud-validate
diff --git a/playbooks/quickstart-extras-standalone.yml b/playbooks/quickstart-extras-standalone.yml
index 0602fa1f5..406d70841 100644
--- a/playbooks/quickstart-extras-standalone.yml
+++ b/playbooks/quickstart-extras-standalone.yml
@@ -58,5 +58,8 @@
     tempest_cloud_name: 'standalone'
   tasks:
     - include_tasks: tasks/tempest.yml
+  environment:
+    # Disable ssl warnings
+    CURL_CA_BUNDLE: ""
   tags:
     - standalone
diff --git a/playbooks/quickstart-extras-validate.yml b/playbooks/quickstart-extras-validate.yml
index 6ee081da3..d0c7e20b0 100644
--- a/playbooks/quickstart-extras-validate.yml
+++ b/playbooks/quickstart-extras-validate.yml
@@ -25,6 +25,9 @@
       vars:
         tempest_install_method: distro
         tempest_cloud_name: 'overcloud'
+  environment:
+    # Disable ssl waarnings
+    CURL_CA_BUNDLE: ""
   tags:
     - overcloud-validate
 
diff --git a/playbooks/tasks/tempest.yml b/playbooks/tasks/tempest.yml
index 73c868f7d..3f1e1958a 100644
--- a/playbooks/tasks/tempest.yml
+++ b/playbooks/tasks/tempest.yml
@@ -57,6 +57,8 @@
 
 - name: Create clouds.yaml if it doesn't exist
   shell: |
+    # queens is returning //v3 so we replace with /v3
+    sed -i 's/\/\/v3/\/v3/g' {{ ansible_user_dir }}/overcloudrc
     source {{ ansible_user_dir }}/overcloudrc
     mkdir -p {{ ansible_user_dir }}/.config/openstack
     cat <<EOF>>{{ ansible_user_dir }}/.config/openstack/clouds.yaml
@@ -74,8 +76,7 @@
     EOF
   when:
     - release in ['queens', 'rocky', 'stein']
-    - use_os_tempest is defined
-    - use_os_tempest | bool
+    - not tempest_cloud_name in ['undercloud', 'standalone']
 
 # Ansible requires openstacksdk>=0.12 do the resource setup, however
 # queens upper-constraint has openstacksdk==0.11.36, so we need to
@@ -101,14 +102,6 @@
           - 'openstacksdk'
         venv_wheel_build_enable: false
 
-# This will execute the validate-tempest
-- name: Execute validate-tempest (deprecated)
-  block:
-    - name: Execute validate-tempest role
-      include_role:
-        name: validate-tempest
-  when: run_tempest | bool
-
 # This will execute os_tempest
 - name: Execute os_tempest
   block:
@@ -153,12 +146,12 @@
     - name: Set network vars
       set_fact:
         tempest_public_net_physical_type: 'datacentre'
-        tempest_private_net_provider_type: "{{ (release in ['queens']) | ternary('vlan', 'geneve') }}"
         tempest_public_subnet_cidr: '{{ tempest_cidr }}'
         tempest_public_subnet_gateway_ip: '{{ tempest_cidr|nthhost(1) }}'
         tempest_public_subnet_allocation_pools: '{{ tempest_cidr|nthhost(100) ~ "-" ~ tempest_cidr|nthhost(150) }}'
         tempest_private_net_seg_id: "{{ (release in ['queens']) | ternary('', omit) }}"
         tempest_network_ping_gateway: true
+        tempest_private_net_provider_type: "{{ (release in ['queens', 'rocky']) | ternary('vlan', 'geneve') }}"
       when: tempest_cidr is defined
 
     - name: Handle migration of br-ex network
@@ -220,9 +213,7 @@
       set_fact:
         tempest_run_stackviz: false
       when:
-        - release|default('master') in ['master', 'queens', 'stein', 'train']
-        - ansible_distribution|lower in ['redhat', 'centos']
-        - ansible_distribution_major_version is version('7', '=')
+        - ansible_distribution_major_version is version('8', '<')
 
     - name: Run os_tempest role
       vars:
@@ -231,7 +222,4 @@
         tempest_run: 'yes'
       include_role:
         name: os_tempest
-  when:
-    - not run_tempest | bool
-    - use_os_tempest is defined
-    - use_os_tempest | bool
+      when: use_os_tempest | default(true)