diff --git a/roles/openstack_helm_tempest/defaults/main.yml b/roles/openstack_helm_tempest/defaults/main.yml
index 28892e6..b07578a 100644
--- a/roles/openstack_helm_tempest/defaults/main.yml
+++ b/roles/openstack_helm_tempest/defaults/main.yml
@@ -1,19 +1,20 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-#    :local:
-
-
-# .. envvar:: openstack_helm_tempest_values [[[
+# Copyright (c) 2023 VEXXHOST, Inc.
 #
-# Overrides for Helm chart values
-openstack_helm_tempest_values: {}
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
 
-                                                                   # ]]]
+openstack_helm_tempest_helm_release_name: tempest
+openstack_helm_tempest_helm_chart_path: "{{ role_path }}/../../charts/tempest/"
+openstack_helm_tempest_helm_chart_ref: /usr/local/src/tempest
+
+openstack_helm_tempest_helm_release_namespace: openstack
+openstack_helm_tempest_helm_values: {}
diff --git a/roles/openstack_helm_tempest/meta/main.yml b/roles/openstack_helm_tempest/meta/main.yml
index d51f71c..d908908 100644
--- a/roles/openstack_helm_tempest/meta/main.yml
+++ b/roles/openstack_helm_tempest/meta/main.yml
@@ -25,4 +25,12 @@
 
 dependencies:
   - role: defaults
+  - role: openstack_helm_endpoints
+    vars:
+      openstack_helm_endpoints_repo_name: openstack-helm
+      openstack_helm_endpoints_chart: tempest
+  - role: upload_helm_chart
+    vars:
+      upload_helm_chart_src: "{{ openstack_helm_tempest_helm_chart_path }}"
+      upload_helm_chart_dest: "{{ openstack_helm_tempest_helm_chart_ref }}"
   - role: openstacksdk
diff --git a/roles/openstack_helm_tempest/tasks/main.yml b/roles/openstack_helm_tempest/tasks/main.yml
index a7f788a..2e78eb5 100644
--- a/roles/openstack_helm_tempest/tasks/main.yml
+++ b/roles/openstack_helm_tempest/tasks/main.yml
@@ -78,22 +78,17 @@
         - openstack_helm_tempest_values.conf.tempest.network.public_network_id is not defined
         - _openstack_helm_tempest_test_network.openstack_networks[0].id is defined
 
-- name: Configure Helm repository
-  kubernetes.core.helm_repository:
-    name: openstack-helm
-    repo_url: https://tarballs.opendev.org/openstack/openstack-helm/
-
 - name: Deploy Helm chart
   failed_when: false
+  run_once: true
   kubernetes.core.helm:
-    name: tempest
-    chart_ref: openstack-helm/tempest
-    chart_version: 0.2.3
-    release_namespace: openstack
+    name: "{{ openstack_helm_tempest_helm_release_name }}"
+    chart_ref: "{{ openstack_helm_tempest_helm_chart_ref }}"
+    release_namespace: "{{ openstack_helm_tempest_helm_release_namespace }}"
     kubeconfig: /etc/kubernetes/admin.conf
+    values: "{{ _openstack_helm_tempest_helm_values | combine(openstack_helm_tempest_helm_values, recursive=True) }}"
     wait: true
     wait_timeout: 20m
-    values: "{{ _openstack_helm_tempest_values | combine(openstack_helm_tempest_values, recursive=True) }}"
 
 - name: Get tempest job object
   kubernetes.core.k8s_info:
diff --git a/roles/openstack_helm_tempest/vars/main.yml b/roles/openstack_helm_tempest/vars/main.yml
index 81da796..390fe04 100644
--- a/roles/openstack_helm_tempest/vars/main.yml
+++ b/roles/openstack_helm_tempest/vars/main.yml
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-_openstack_helm_tempest_values:
+_openstack_helm_tempest_helm_values:
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags: "{{ atmosphere_images | openstack_helm_image_tags('tempest') }}"