diff --git a/.zuul.yaml b/.zuul.yaml
index 442f9d9..f0c8fb8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,8 +3,10 @@
     parent: devstack-tempest
     description: |
       This job is for testing telemetry components.
-    irrelevant-files:
+    irrelevant-files: &base_irrelevant_files
+      - ^\.gitignore$
       - ^\.gitreview$
+      - ^\.pre-commit-config\.yaml$
       - ^(test-|)requirements.txt$
       - ^setup.cfg$
       - ^doc/.*$
@@ -20,7 +22,8 @@
       - openstack/heat
       - openstack/diskimage-builder
       - openstack/tempest
-      - gnocchixyz/gnocchi
+      - name: gnocchixyz/gnocchi
+        override-checkout: stable/4.7
       - openstack-k8s-operators/sg-core
     vars: &base_vars
       configure_swap_size: 8192
@@ -37,6 +40,7 @@
         tempest: true
         node_exporter: false
       devstack_localrc:
+        LIBS_FROM_GIT: gnocchi
         TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"'
         GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
         CEILOMETER_BACKENDS: "gnocchi,sg-core"
@@ -143,12 +147,7 @@
     parent: devstack-tempest-ipv6
     description: |
       Telemetry devstack tempest tests job for IPv6-only deployment
-    irrelevant-files:
-      - ^(test-|)requirements.txt$
-      - ^setup.cfg$
-      - ^doc/.*$
-      - ^.*\.rst$
-      - ^releasenotes/.*$
+    irrelevant-files: *base_irrelevant_files
     required-projects: *base_required_projects
     vars: *base_vars
 
@@ -248,12 +247,7 @@
     voting: false
     description: |
       Telemetry devstack tempest tests job with Aetos for IPv6-only deployment
-    irrelevant-files:
-      - ^(test-|)requirements.txt$
-      - ^setup.cfg$
-      - ^doc/.*$
-      - ^.*\.rst$
-      - ^releasenotes/.*$
+    irrelevant-files: *base_irrelevant_files
     required-projects: *aetos_required_projects
     vars: *aetos_vars
 
diff --git a/telemetry_tempest_plugin/config.py b/telemetry_tempest_plugin/config.py
index bf546ee..0086525 100644
--- a/telemetry_tempest_plugin/config.py
+++ b/telemetry_tempest_plugin/config.py
@@ -80,11 +80,11 @@
                 default=False,
                 help="Disable SSL certificate validation when running "
                      "scenario tests"),
-    cfg.StrOpt('sg_core_service_url',
+    cfg.URIOpt('sg_core_service_url',
                default="http://127.0.0.1:3000",
                help="URL to sg-core prometheus endpoint"),
-    cfg.StrOpt('prometheus_service_url',
-               default="127.0.0.1:9090",
+    cfg.URIOpt('prometheus_service_url',
+               default="http://127.0.0.1:9090",
                help="URL to prometheus endpoint"),
     cfg.IntOpt('ceilometer_polling_interval',
                default=300,
diff --git a/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py b/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py
index 6f9e3f6..1def0f6 100644
--- a/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py
+++ b/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py
@@ -166,7 +166,6 @@
             "NEUTRON_NETWORK": self.stack_network_id,
             "STACK_NAME": self.stack_name,
             "RESOURCE_PREFIX": resource_prefix,
-            "PROMETHEUS_RATE_DURATION": str(prometheus_rate_duration),
             "LOAD_LENGTH": str(prometheus_rate_duration * 2),
             "QUERY": query,
         })