diff --git a/.zuul.yaml b/.zuul.yaml
index afc9cc6..a1cbb9c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,9 +16,7 @@
         USE_PYTHON3: True
         PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core
         CEILOMETER_BACKEND: sg-core
-        PROMETHEUS_CONF_DIR: /opt/stack
-        PROMETHEUS_CONFIG_FILE: /opt/stack/prometheus.yml
-        PROMETHEUS_CLIENT_CONF_DIR: /etc/openstack
+        PROMETHEUS_CUSTOM_SCRAPE_TARGETS: "localhost:3000,localhost:9090"
       devstack_plugins:
         sg-core: https://github.com/openstack-k8s-operators/sg-core
         ceilometer: https://opendev.org/openstack/ceilometer
diff --git a/observabilityclient/tests/functional/test_cli.py b/observabilityclient/tests/functional/test_cli.py
index 626be60..4a8c053 100644
--- a/observabilityclient/tests/functional/test_cli.py
+++ b/observabilityclient/tests/functional/test_cli.py
@@ -88,7 +88,7 @@ class CliTestFunctionalRBACEnabled(base.CliTestCase):
                 metric["__name__"]
             )
             self.assertEqual(
-                "sg-core",
+                "custom",
                 metric["job"]
             )
 
@@ -103,7 +103,7 @@ class CliTestFunctionalRBACEnabled(base.CliTestCase):
                 metric["__name__"]
             )
             self.assertEqual(
-                "sg-core",
+                "custom",
                 metric["job"]
             )
 
diff --git a/observabilityclient/tests/functional/test_python_api.py b/observabilityclient/tests/functional/test_python_api.py
index 8f3bf85..162b7d8 100644
--- a/observabilityclient/tests/functional/test_python_api.py
+++ b/observabilityclient/tests/functional/test_python_api.py
@@ -52,7 +52,7 @@ class PythonAPITestFunctionalRBACEnabled(base.PythonAPITestCase):
         for metric in ret:
             self.assertEqual("ceilometer_image_size",
                              metric.labels["__name__"])
-            self.assertEqual("sg-core",
+            self.assertEqual("custom",
                              metric.labels["job"])
 
     def test_query(self):
@@ -62,7 +62,7 @@ class PythonAPITestFunctionalRBACEnabled(base.PythonAPITestCase):
         for metric in ret:
             self.assertEqual("ceilometer_image_size",
                              metric.labels["__name__"])
-            self.assertEqual("sg-core", metric.labels["job"])
+            self.assertEqual("custom", metric.labels["job"])
 
 
 class PythonAPITestFunctionalAdminCommands(base.PythonAPITestCase):