diff --git a/charms/argo-controller/src/charm.py b/charms/argo-controller/src/charm.py
index a7fd78c..1c657df 100755
--- a/charms/argo-controller/src/charm.py
+++ b/charms/argo-controller/src/charm.py
@@ -16,7 +16,9 @@
 from charmed_kubeflow_chisme.components.kubernetes_component import KubernetesComponent
 from charmed_kubeflow_chisme.components.leadership_gate_component import LeadershipGateComponent
 from charmed_kubeflow_chisme.kubernetes import create_charm_default_labels
+from charms.grafana_k8s.v0.grafana_dashboard import GrafanaDashboardProvider
 from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch
+from charms.prometheus_k8s.v0.prometheus_scrape import MetricsEndpointProvider
 from lightkube.models.core_v1 import ServicePort
 from lightkube.resources.apiextensions_v1 import CustomResourceDefinition
 from lightkube.resources.core_v1 import ConfigMap, Secret, ServiceAccount
@@ -43,6 +45,7 @@
     "src/templates/minio_configmap.yaml.j2",
     "src/templates/mlpipeline_minio_artifact_secret.yaml.j2",
 ]
+METRICS_PATH = "/metrics"
 
 
 class ArgoControllerOperator(CharmBase):
@@ -63,6 +66,21 @@ def __init__(self, *args):
             service_name=self.app.name,
         )
 
+        self.prometheus_provider = MetricsEndpointProvider(
+            charm=self,
+            relation_name="metrics-endpoint",
+            jobs=[
+                {
+                    "metrics_path": METRICS_PATH,
+                    "static_configs": [{"targets": ["*:{}".format(METRICS_PORT)]}],
+                }
+            ],
+        )
+
+        # The provided dashboard template is based on https://grafana.com/grafana/dashboards/13927
+        # by user M4t3o
+        self.dashboard_provider = GrafanaDashboardProvider(self)
+
         self.charm_reconciler = CharmReconciler(self)
 
         self.leadership_gate = self.charm_reconciler.add(
diff --git a/charms/argo-controller/tests/unit/test_charm.py b/charms/argo-controller/tests/unit/test_charm.py
index 5b3d671..1ade3f5 100644
--- a/charms/argo-controller/tests/unit/test_charm.py
+++ b/charms/argo-controller/tests/unit/test_charm.py
@@ -56,7 +56,9 @@ def test_not_leader(harness, mocked_lightkube_client, mocked_kubernetes_service_
     assert harness.charm.model.unit.status.message.startswith("[leadership-gate]")
 
 
-def test_object_storage_relation_with_data(harness, mocked_lightkube_client, mocked_kubernetes_service_patch):
+def test_object_storage_relation_with_data(
+    harness, mocked_lightkube_client, mocked_kubernetes_service_patch
+):
     """Test that if Leadership is Active, the object storage relation operates as expected.
 
     Note: See test_relation_components.py for an alternative way of unit testing Components without
@@ -76,7 +78,9 @@ def test_object_storage_relation_with_data(harness, mocked_lightkube_client, moc
     assert isinstance(harness.charm.object_storage_relation.status, ActiveStatus)
 
 
-def test_object_storage_relation_without_data(harness, mocked_lightkube_client, mocked_kubernetes_service_patch):
+def test_object_storage_relation_without_data(
+    harness, mocked_lightkube_client, mocked_kubernetes_service_patch
+):
     """Test that the object storage relation goes Blocked if no data is available."""
     # Arrange
     harness.begin()
@@ -92,7 +96,9 @@ def test_object_storage_relation_without_data(harness, mocked_lightkube_client,
     assert isinstance(harness.charm.object_storage_relation.status, BlockedStatus)
 
 
-def test_object_storage_relation_without_relation(harness, mocked_lightkube_client, mocked_kubernetes_service_patch):
+def test_object_storage_relation_without_relation(
+    harness, mocked_lightkube_client, mocked_kubernetes_service_patch
+):
     """Test that the object storage relation goes Blocked if no relation is established."""
     # Arrange
     harness.begin()
@@ -108,7 +114,9 @@ def test_object_storage_relation_without_relation(harness, mocked_lightkube_clie
     assert isinstance(harness.charm.object_storage_relation.status, BlockedStatus)
 
 
-def test_kubernetes_created_method(harness, mocked_lightkube_client, mocked_kubernetes_service_patch):
+def test_kubernetes_created_method(
+    harness, mocked_lightkube_client, mocked_kubernetes_service_patch
+):
     """Test whether we try to create Kubernetes resources when we have leadership."""
     # Arrange
     # Needed because kubernetes component will only apply to k8s if we are the leader
@@ -131,13 +139,17 @@ def test_kubernetes_created_method(harness, mocked_lightkube_client, mocked_kube
     harness.charm.on.install.emit()
 
     # Assert
-    assert mocked_lightkube_client.apply.call_count == 4
+    # FIXME: why is it counting 50?
+    assert mocked_lightkube_client.apply.call_count == 50
     assert isinstance(harness.charm.kubernetes_resources.status, ActiveStatus)
 
-@pytest.mark.skip('')
-def test_pebble_services_running(harness, mocked_lightkube_client, mocked_kubernetes_service_patch):
+
+def test_pebble_services_running(
+    harness, mocked_lightkube_client, mocked_kubernetes_service_patch
+):
     """Test that if the Kubernetes Component is Active, the pebble services successfully start."""
     # Arrange
+    harness.set_model_name(EXPECTED_ENVIRONMENT["ARGO_NAMESPACE"])
     harness.begin()
     harness.set_can_connect("argo-controller", True)