diff --git a/defaults/main.yml b/defaults/main.yml
index 9d91d794..8eb08702 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -84,6 +84,63 @@ tempest_log_dir: "/var/log/tempest"
 #     package: ironic                                                    #for installing the plugin from packages
 tempest_plugins: "{{ _tempest_plugins.values() | sum(start=[]) | selectattr('install', 'equalto', true) | list }}"
 
+tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin
+tempest_plugin_barbican_git_install_branch: master
+
+tempest_plugin_cinder_git_repo: https://opendev.org/openstack/cinder-tempest-plugin
+tempest_plugin_cinder_git_install_branch: master
+
+tempest_plugin_cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty-tempest-plugin
+tempest_plugin_cloudkitty_git_install_branch: master
+
+tempest_plugin_designate_git_repo: https://opendev.org/openstack/designate-tempest-plugin
+tempest_plugin_designate_git_install_branch: master
+
+tempest_plugin_heat_git_repo: https://opendev.org/openstack/heat-tempest-plugin
+tempest_plugin_heat_git_install_branch: master
+
+tempest_plugin_ironic_git_repo: https://opendev.org/openstack/ironic-tempest-plugin
+tempest_plugin_ironic_git_install_branch: master
+
+tempest_plugin_keystone_git_repo: https://opendev.org/openstack/keystone-tempest-plugin
+tempest_plugin_keystone_git_install_branch: master
+
+tempest_plugin_magnum_git_repo: https://opendev.org/openstack/magnum-tempest-plugin
+tempest_plugin_magnum_git_install_branch: master
+
+tempest_plugin_manila_git_repo: https://opendev.org/openstack/manila-tempest-plugin
+tempest_plugin_manila_git_install_branch: master
+
+tempest_plugin_murano_git_repo: https://opendev.org/openstack/murano-tempest-plugin
+tempest_plugin_murano_git_install_branch: master
+
+tempest_plugin_neutron_git_repo: https://opendev.org/openstack/neutron-tempest-plugin
+tempest_plugin_neutron_git_install_branch: 1.8.0
+
+tempest_plugin_novajoin_git_repo: https://opendev.org/x/novajoin-tempest-plugin
+tempest_plugin_novajoin_git_install_branch: master
+
+tempest_plugin_octavia_git_repo: https://opendev.org/openstack/octavia-tempest-plugin
+tempest_plugin_octavia_git_install_branch: master
+
+tempest_plugin_senlin_git_repo: https://opendev.org/openstack/senlin-tempest-plugin
+tempest_plugin_senlin_git_install_branch: master
+
+tempest_plugin_sahara_git_repo: https://opendev.org/openstack/sahara-tests
+tempest_plugin_sahara_git_install_branch: master
+
+tempest_plugin_telemetry_git_repo: https://opendev.org/openstack/telemetry-tempest-plugin
+tempest_plugin_telemetry_git_install_branch: master
+
+tempest_plugin_trove_git_repo: https://opendev.org/openstack/trove-tempest-plugin
+tempest_plugin_trove_git_install_branch: master
+
+tempest_plugin_zaqar_git_repo: https://opendev.org/openstack/zaqar-tempest-plugin
+tempest_plugin_zaqar_git_install_branch: master
+
+tempest_plugin_zun_git_repo: https://opendev.org/openstack/zun-tempest-plugin
+tempest_plugin_zun_git_install_branch: master
+
 # tempest_workspace where tempest can be runned
 tempest_workspace: "{{ ansible_facts['env']['HOME'] }}/workspace"
 
diff --git a/vars/main.yml b/vars/main.yml
index 2ccece18..fa0756cd 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -53,18 +53,18 @@ tempest_images_map:
 _tempest_plugins:
   barbican:
     - name: barbican-tempest-plugin
-      repo: https://opendev.org/openstack/barbican-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_barbican_git_repo }}"
+      branch: "{{ tempest_plugin_barbican_git_install_branch }}"
       install: "{{ tempest_service_available_barbican | bool }}"
   cinder:
     - name: cinder-tempest-plugin
-      repo: https://opendev.org/openstack/cinder-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_cinder_git_repo }}"
+      branch: "{{ tempest_plugin_cinder_git_install_branch }}"
       install: "{{ tempest_service_available_cinder | bool }}"
   cloudkitty:
     - name: cloudkitty-tempest-plugin
-      repo: https://opendev.org/openstack/cloudkitty-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_cloudkitty_git_repo }}"
+      branch: "{{ tempest_plugin_cloudkitty_git_install_branch }}"
       install: "{{ tempest_service_available_cloudkitty | bool }}"
   congress:
     - name: congress-tempest-plugin
@@ -73,38 +73,38 @@ _tempest_plugins:
       install: "{{ tempest_service_available_congress | bool }}"
   designate:
     - name: designate-tempest-plugin
-      repo: https://opendev.org/openstack/designate-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_designate_git_repo }}"
+      branch: "{{ tempest_plugin_designate_git_install_branch }}"
       install: "{{ tempest_service_available_designate | bool }}"
   heat:
     - name: heat-tempest-plugin
-      repo: https://opendev.org/openstack/heat-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_heat_git_repo }}"
+      branch: "{{ tempest_plugin_heat_git_install_branch }}"
       install: "{{ tempest_service_available_heat | bool }}"
   ironic:
     - name: ironic-tempest-plugin
-      repo: https://opendev.org/openstack/ironic-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_ironic_git_repo }}"
+      branch: "{{ tempest_plugin_ironic_git_install_branch }}"
       install: "{{ tempest_service_available_ironic | bool }}"
   keystone:
     - name: keystone-tempest-plugin
-      repo: https://opendev.org/openstack/keystone-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_keystone_git_repo }}"
+      branch: "{{ tempest_plugin_keystone_git_install_branch }}"
       install: yes
   magnum:
     - name: magnum-tempest-plugin
-      repo: https://opendev.org/openstack/magnum-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_magnum_git_repo }}"
+      branch: "{{ tempest_plugin_magnum_git_install_branch }}"
       install: "{{ tempest_service_available_magnum | bool }}"
   manila:
     - name: manila-tempest-plugin
-      repo: https://opendev.org/openstack/manila-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_manila_git_repo }}"
+      branch: "{{ tempest_plugin_manila_git_install_branch }}"
       install: "{{ tempest_service_available_manila | bool }}"
   murano:
     - name: murano-tempest-plugin
-      repo: https://opendev.org/openstack/murano-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_murano_git_repo }}"
+      branch: "{{ tempest_plugin_murano_git_install_branch }}"
       install: "{{ tempest_service_available_murano | bool }}"
   networking-bgpvpn:
     - name: networking-bgpvpn
@@ -118,13 +118,13 @@ _tempest_plugins:
       install: "{{ tempest_service_available_neutron_vpnaas | bool }}"
   neutron:
     - name: neutron-tempest-plugin
-      repo: https://opendev.org/openstack/neutron-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_neutron_git_repo }}"
+      branch: "{{ tempest_plugin_neutron_git_install_branch }}"
       install: "{{ tempest_service_available_neutron | bool }}"
   novajoin:
     - name: novajoin-tempest-plugin
-      repo: https://opendev.org/openstack/novajoin-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_novajoin_git_repo }}"
+      branch: "{{ tempest_plugin_novajoin_git_install_branch }}"
       install: "{{ tempest_service_available_novajoin | bool }}"
   nova-lxd:
     - name: nova-lxd
@@ -133,36 +133,36 @@ _tempest_plugins:
       install: "{{ tempest_service_available_nova_lxd | bool }}"
   octavia:
     - name: octavia-tempest-plugin
-      repo: https://opendev.org/openstack/octavia-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_octavia_git_repo }}"
+      branch: "{{ tempest_plugin_octavia_git_install_branch }}"
       install: "{{ tempest_service_available_octavia | bool }}"
   senlin:
     - name: senlin-tempest-plugin
-      repo: https://opendev.org/openstack/senlin-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_senlin_git_repo }}"
+      branch: "{{ tempest_plugin_senlin_git_install_branch }}"
       install: "{{ tempest_service_available_senlin | bool }}"
   sahara:
     - name: sahara-tests
-      repo: https://opendev.org/openstack/sahara-tests
-      branch: master
+      repo: "{{ tempest_plugin_sahara_git_repo }}"
+      branch: "{{ tempest_plugin_sahara_git_install_branch }}"
       install: "{{ tempest_service_available_sahara | bool }}"
   telemetry:
     - name: telemetry-tempest-plugin
-      repo: https://opendev.org/openstack/telemetry-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_telemetry_git_repo }}"
+      branch: "{{ tempest_plugin_telemetry_git_install_branch }}"
       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
-      branch: master
+      repo: "{{ tempest_plugin_trove_git_repo }}"
+      branch: "{{ tempest_plugin_trove_git_install_branch }}"
       install: "{{ tempest_service_available_trove | bool }}"
   zaqar:
     - name: zaqar-tempest-plugin
-      repo: https://opendev.org/openstack/zaqar-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_zaqar_git_repo }}"
+      branch: "{{ tempest_plugin_zaqar_git_install_branch }}"
       install: "{{ tempest_service_available_zaqar | bool }}"
   zun:
     - name: zun-tempest-plugin
-      repo: https://opendev.org/openstack/zun-tempest-plugin
-      branch: master
+      repo: "{{ tempest_plugin_zun_git_repo }}"
+      branch: "{{ tempest_plugin_zun_git_install_branch }}"
       install: "{{ tempest_service_available_zun | bool }}"