diff --git a/ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main.yaml b/ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main.yaml
index 386730a392faf..9c4fcb6950b20 100644
--- a/ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main.yaml
+++ b/ci-operator/config/Azure/ARO-HCP/Azure-ARO-HCP-main.yaml
@@ -179,6 +179,11 @@ tests:
   steps:
     test:
     - ref: aro-hcp-observability-prometheus
+- as: observability-grafana
+  run_if_changed: ^observability/grafana/
+  steps:
+    test:
+    - ref: aro-hcp-observability-grafana
 - as: bicep-lint
   run_if_changed: ^dev-infrastructure/
   steps:
diff --git a/ci-operator/jobs/Azure/ARO-HCP/Azure-ARO-HCP-main-presubmits.yaml b/ci-operator/jobs/Azure/ARO-HCP/Azure-ARO-HCP-main-presubmits.yaml
index 173322f2ddd9e..0be6a3b94211e 100644
--- a/ci-operator/jobs/Azure/ARO-HCP/Azure-ARO-HCP-main-presubmits.yaml
+++ b/ci-operator/jobs/Azure/ARO-HCP/Azure-ARO-HCP-main-presubmits.yaml
@@ -886,6 +886,87 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )mega-linter,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build05
+    context: ci/prow/observability-grafana
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-Azure-ARO-HCP-main-observability-grafana
+    rerun_command: /test observability-grafana
+    run_if_changed: ^observability/grafana/
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=observability-grafana
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )observability-grafana,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/step-registry/aro-hcp/observability-grafana/OWNERS b/ci-operator/step-registry/aro-hcp/observability-grafana/OWNERS
new file mode 100644
index 0000000000000..d07c991ffb989
--- /dev/null
+++ b/ci-operator/step-registry/aro-hcp/observability-grafana/OWNERS
@@ -0,0 +1,15 @@
+approvers:
+- geoberle
+- jharrington22
+- mmazur
+- roivaz
+- venkateshsredhat
+- deads2k
+reviewers:
+- geoberle
+- jharrington22
+- mmazur
+- roivaz
+- venkateshsredhat
+- deads2k
+
diff --git a/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-commands.sh b/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-commands.sh
new file mode 100644
index 0000000000000..bc3ff430c0dce
--- /dev/null
+++ b/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-commands.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+make -C observability verify
diff --git a/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.metadata.json b/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.metadata.json
new file mode 100644
index 0000000000000..4efa0bd026cf6
--- /dev/null
+++ b/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.metadata.json
@@ -0,0 +1,21 @@
+{
+	"path": "aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.yaml",
+	"owners": {
+		"approvers": [
+			"geoberle",
+			"jharrington22",
+			"mmazur",
+			"roivaz",
+			"venkateshsredhat",
+			"deads2k"
+		],
+		"reviewers": [
+			"geoberle",
+			"jharrington22",
+			"mmazur",
+			"roivaz",
+			"venkateshsredhat",
+			"deads2k"
+		]
+	}
+}
\ No newline at end of file
diff --git a/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.yaml b/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.yaml
new file mode 100644
index 0000000000000..2fbb3be3f71c5
--- /dev/null
+++ b/ci-operator/step-registry/aro-hcp/observability-grafana/aro-hcp-observability-grafana-ref.yaml
@@ -0,0 +1,11 @@
+ref:
+  as: aro-hcp-observability-grafana
+  from: aro-hcp-e2e-tools
+  commands: aro-hcp-observability-grafana-commands.sh
+  grace_period: 30s
+  resources:
+    requests:
+      cpu: 4000m
+      memory: 4Gi
+  documentation: |-
+    Run grafana script tests and formatting.