diff --git a/defaults/main.yml b/defaults/main.yml
index 8b7e0266..7e27cd8f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -180,6 +180,7 @@ tempest_service_available_cloudkitty: "{{ groups['cloudkitty_all'] is defined an
 tempest_service_available_congress: "{{ groups['congress_all'] is defined and groups['congress_all'] | length > 0 }}"
 tempest_service_available_designate: "{{ groups['designate_all'] is defined and groups['designate_all'] | length > 0 }}"
 tempest_service_available_glance: "{{ groups['glance_all'] is defined and groups['glance_all'] | length > 0 }}"
+tempest_service_available_gnocchi: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"
 tempest_service_available_heat: "{{ groups['heat_all'] is defined and groups['heat_all'] | length > 0 }}"
 tempest_service_available_horizon: "{{ groups['horizon_all'] is defined and groups['horizon_all'] | length > 0 }}"
 tempest_service_available_ironic: "{{ groups['ironic_all'] is defined and groups['ironic_all'] | length > 0 }}"
@@ -199,6 +200,7 @@ tempest_service_available_novajoin: False
 tempest_service_available_nova_lxd: False
 
 tempest_service_available_octavia: "{{ groups['octavia_all'] is defined and groups['octavia_all'] | length > 0 }}"
+tempest_service_available_panko: "{{ groups['panko_all'] is defined and groups['panko_all'] | length > 0 }}"
 tempest_service_available_sahara: "{{ groups['sahara_all'] is defined and groups['sahara_all'] | length > 0 }}"
 tempest_service_available_senlin: "{{ groups['senlin_all'] is defined and groups['senlin_all'] | length > 0 }}"
 tempest_service_available_swift: "{{ (groups['swift_all'] is defined and groups['swift_all'] | length > 0) or (groups['ceph-rgw'] is defined and groups['ceph-rgw'] | length > 0) or (ceph_rgws is defined and ceph_rgws | length > 0) }}"
diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2
index 66dc77d8..8a32914f 100644
--- a/templates/tempest.conf.j2
+++ b/templates/tempest.conf.j2
@@ -141,6 +141,7 @@ http_timeout = 120
 cinder = {{ tempest_service_available_cinder }}
 neutron = {{ tempest_service_available_neutron }}
 glance = {{ tempest_service_available_glance }}
+gnocchi = {{ tempest_service_available_gnocchi }}
 swift = {{ tempest_service_available_swift }}
 nova = {{ tempest_service_available_nova }}
 heat = {{ tempest_service_available_heat }}
@@ -152,6 +153,7 @@ sahara = {{ tempest_service_available_sahara }}
 zaqar = {{ tempest_service_available_zaqar }}
 manila = {{ tempest_service_available_manila }}
 murano = {{ tempest_service_available_murano }}
+panko = {{ tempest_service_available_panko }}
 trove = {{ tempest_service_available_trove }}
 zun = {{ tempest_service_available_zun }}
 
diff --git a/vars/main.yml b/vars/main.yml
index 632e6675..c1a36961 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -150,7 +150,7 @@ _tempest_plugins:
     - name: telemetry-tempest-plugin
       repo: https://opendev.org/openstack/telemetry-tempest-plugin
       branch: master
-      install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) }}"
+      install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) or (tempest_service_available_gnocchi | bool) or (tempest_service_available_panko | bool) }}"
   trove:
     - name: trove-tempest-plugin
       repo: https://opendev.org/openstack/trove-tempest-plugin