diff --git a/global/software/charts/osh/openstack-tempest/chart-group.yaml b/global/software/charts/osh/openstack-tempest/chart-group.yaml
new file mode 100644
index 000000000..953c078cd
--- /dev/null
+++ b/global/software/charts/osh/openstack-tempest/chart-group.yaml
@@ -0,0 +1,16 @@
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-tempest
+  labels:
+    name: openstack-tempest-chart-group-global
+    component: tempest
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+data:
+  description: Deploy Tempest
+  chart_group:
+    - tempest
diff --git a/global/software/charts/osh/openstack-tempest/tempest.yaml b/global/software/charts/osh/openstack-tempest/tempest.yaml
new file mode 100644
index 000000000..2aebb103c
--- /dev/null
+++ b/global/software/charts/osh/openstack-tempest/tempest.yaml
@@ -0,0 +1,94 @@
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: tempest
+  labels:
+    name: tempest-global
+    component: tempest
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+  substitutions:
+    # Chart source
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .charts.osh.tempest
+      dest:
+        path: .source
+
+    # Images
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .images.osh.tempest
+      dest:
+        path: .values.images.tags
+
+    # Endpoints
+    - src:
+        schema: pegleg/EndpointCatalogue/v1
+        name: osh_endpoints
+        path: .osh.identity
+      dest:
+        path: .values.endpoints.identity
+
+    # Service Accounts
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: osh_service_accounts
+        path: .osh.keystone.admin
+      dest:
+        path: .values.endpoints.identity.auth.admin
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: osh_service_accounts
+        path: .osh.tempest.tempest
+      dest:
+        path: .values.endpoints.identity.auth.tempest
+
+    # Secrets
+    - dest:
+        path: .values.endpoints.identity.auth.admin.password
+      src:
+        schema: deckhand/Passphrase/v1
+        name: osh_keystone_admin_password
+        path: .
+    - dest:
+        path: .values.endpoints.identity.auth.tempest.password
+      src:
+        schema: deckhand/Passphrase/v1
+        name: osh_tempest_password
+        path: .
+data:
+  chart_name: tempest
+  release: tempest
+  namespace: openstack
+  wait:
+    timeout: 900
+    labels:
+      release_group: airship-tempest
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+    pre:
+      delete:
+        - type: job
+          labels:
+            release_group: airship-tempest
+    post:
+      create: []
+  values:
+    labels:
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+    ceph_client:
+      configmap: tenant-ceph-etc
+      user_secret_name: pvc-tceph-client-key
+  dependencies:
+    - osh-helm-toolkit
+...
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index f912b7414..cb913270e 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -179,6 +179,11 @@ data:
         reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e
         subpath: rabbitmq
         type: git
+      tempest:
+        location: https://opendev.org/openstack/openstack-helm
+        reference: 9bca5deacde31fce79b556c0d63926144a482b7f
+        subpath: tempest
+        type: git
     osh_infra:
       elasticsearch:
         location: https://opendev.org/openstack/openstack-helm-infra
@@ -516,6 +521,7 @@ data:
       nova: {}
       openvswitch: {}
       rabbitmq: {}
+      tempest: {}
     osh_infra:
       elasticsearch: {}
       fluent_logging: {}
diff --git a/site/airship-seaworthy/secrets/passphrases/osh_tempest_password.yaml b/site/airship-seaworthy/secrets/passphrases/osh_tempest_password.yaml
new file mode 100644
index 000000000..af90ec05b
--- /dev/null
+++ b/site/airship-seaworthy/secrets/passphrases/osh_tempest_password.yaml
@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: osh_tempest_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...
diff --git a/site/airship-seaworthy/software/config/service_accounts.yaml b/site/airship-seaworthy/software/config/service_accounts.yaml
index db92570e5..e5ecd4950 100644
--- a/site/airship-seaworthy/software/config/service_accounts.yaml
+++ b/site/airship-seaworthy/software/config/service_accounts.yaml
@@ -372,6 +372,13 @@ data:
           username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    tempest:
+      tempest:
+        role: admin
+        username: tempest
+        project_name: service
+        user_domain_name: default
+        project_domain_name: default
 ...
 ---
 schema: pegleg/AccountCatalogue/v1
diff --git a/site/airskiff/secrets/passphrases/osh_tempest_password.yaml b/site/airskiff/secrets/passphrases/osh_tempest_password.yaml
new file mode 100644
index 000000000..af90ec05b
--- /dev/null
+++ b/site/airskiff/secrets/passphrases/osh_tempest_password.yaml
@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: osh_tempest_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...
diff --git a/site/airskiff/software/config/service_accounts.yaml b/site/airskiff/software/config/service_accounts.yaml
index db92570e5..e5ecd4950 100644
--- a/site/airskiff/software/config/service_accounts.yaml
+++ b/site/airskiff/software/config/service_accounts.yaml
@@ -372,6 +372,13 @@ data:
           username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    tempest:
+      tempest:
+        role: admin
+        username: tempest
+        project_name: service
+        user_domain_name: default
+        project_domain_name: default
 ...
 ---
 schema: pegleg/AccountCatalogue/v1
diff --git a/site/airsloop/secrets/passphrases/osh_tempest_password.yaml b/site/airsloop/secrets/passphrases/osh_tempest_password.yaml
new file mode 100644
index 000000000..af90ec05b
--- /dev/null
+++ b/site/airsloop/secrets/passphrases/osh_tempest_password.yaml
@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: osh_tempest_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...
diff --git a/type/sloop/config/service_accounts.yaml b/type/sloop/config/service_accounts.yaml
index ca6e94720..d68f3736d 100644
--- a/type/sloop/config/service_accounts.yaml
+++ b/type/sloop/config/service_accounts.yaml
@@ -372,6 +372,13 @@ data:
           username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    tempest:
+      tempest:
+        role: admin
+        username: tempest
+        project_name: service
+        user_domain_name: default
+        project_domain_name: default
 ...
 ---
 schema: pegleg/AccountCatalogue/v1