diff --git a/Makefile b/Makefile
index 41397e9cc4..53693710da 100644
--- a/Makefile
+++ b/Makefile
@@ -321,7 +321,11 @@ test-experimental-e2e: run-internal image-registry prometheus e2e e2e-coverage k
 prometheus: PROMETHEUS_NAMESPACE := olmv1-system
 prometheus: PROMETHEUS_VERSION := v0.83.0
 prometheus: $(KUSTOMIZE) #EXHELP Deploy Prometheus into specified namespace
+ifeq ($(strip $(E2E_SUMMARY_OUTPUT)),)
+	@echo "E2E_SUMMARY_OUTPUT unset; skipping prometheus deployment"
+else
 	./hack/test/install-prometheus.sh $(PROMETHEUS_NAMESPACE) $(PROMETHEUS_VERSION) $(VERSION) $(PROMETHEUS_VALUES)
+endif
 
 .PHONY: test-extension-developer-e2e
 test-extension-developer-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)
diff --git a/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml b/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
index b77a090b22..b56b06eba9 100644
--- a/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
+++ b/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
@@ -12,22 +12,22 @@ spec:
           name: prometheus-metrics-token
       interval: 10s
       path: /metrics
-      port: https
+      port: metrics
       scheme: https
       tlsConfig:
         ca:
           secret:
             key: ca.crt
-            name: olmv1-cert
+            name: operator-controller-cert
         cert:
           secret:
             key: tls.crt
-            name: olmv1-cert
+            name: operator-controller-cert
         insecureSkipVerify: false
         keySecret:
           key: tls.key
-          name: olmv1-cert
+          name: operator-controller-cert
         serverName: operator-controller-service.{{ .Values.namespaces.olmv1.name }}.svc
   selector:
     matchLabels:
-      control-plane: operator-controller-controller-manager
+      app.kubernetes.io/name: operator-controller
diff --git a/internal/shared/util/test/summary.go b/internal/shared/util/test/summary.go
index 5baa4db069..e5dc4c195c 100644
--- a/internal/shared/util/test/summary.go
+++ b/internal/shared/util/test/summary.go
@@ -80,7 +80,7 @@ func (s *githubSummary) PerformanceQuery(title, pod, query, yLabel string, scale
 	matrix, ok := result.(model.Matrix)
 	if !ok {
 		return "", fmt.Errorf("typecast for metrics samples failed; aborting")
-	} else if len(matrix) > 1 {
+	} else if len(matrix) != 1 {
 		return "", fmt.Errorf("expected 1 set of results; got: %d", len(matrix))
 	}
 	chart := xychart{
@@ -160,7 +160,7 @@ func executeTemplate(templateFile string, obj any) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("failed to get working directory: %w", err)
 	}
-	tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/testutils/templates", templateFile))
+	tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/test/templates", templateFile))
 	if err != nil {
 		return "", err
 	}