diff --git a/cmd/pj-rehearse/main.go b/cmd/pj-rehearse/main.go
index 9dd6da01..ff1b79bf 100644
--- a/cmd/pj-rehearse/main.go
+++ b/cmd/pj-rehearse/main.go
@@ -132,10 +132,9 @@ func rehearseMain() int {
 			return gracefulExit(o.noFail, misconfigurationOutput)
 		}
 	}
+	metrics.JobSpec = jobSpec
 
 	prFields := logrus.Fields{prowgithub.OrgLogField: jobSpec.Refs.Org, prowgithub.RepoLogField: jobSpec.Refs.Repo}
-	metrics.Org = jobSpec.Refs.Org
-	metrics.Repo = jobSpec.Refs.Repo
 	logger := logrus.WithFields(prFields)
 
 	if jobSpec.Type != pjapi.PresubmitJob {
@@ -149,7 +148,7 @@ func rehearseMain() int {
 	if o.local {
 		prNumber = int(time.Now().Unix())
 	}
-	metrics.Pr = prNumber
+
 	logger = logrus.WithField(prowgithub.PrLogField, prNumber)
 	logger.Info("Rehearsing Prow jobs for a configuration PR")
 
diff --git a/pkg/rehearse/metrics.go b/pkg/rehearse/metrics.go
index 4249338d..74353847 100644
--- a/pkg/rehearse/metrics.go
+++ b/pkg/rehearse/metrics.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 	prowconfig "k8s.io/test-infra/prow/config"
+	"k8s.io/test-infra/prow/pod-utils/downwardapi"
 
 	"github.com/openshift/ci-operator-prowgen/pkg/config"
 )
@@ -17,9 +18,7 @@ type ExecutionMetrics struct {
 }
 
 type Metrics struct {
-	Org  string `json:"org"`
-	Repo string `json:"repo"`
-	Pr   int    `json:"pr"`
+	JobSpec *downwardapi.JobSpec `json:"spec"`
 
 	ChangedCiopConfigs     []string `json:"changed_ciop_configs"`
 	ChangedPresubmits      []string `json:"changed_presubmits"`
@@ -34,6 +33,11 @@ type Metrics struct {
 
 	logger logrus.Entry
 	file   string
+
+	// DEPRECATED (we need to keep these to read old artifacts)
+	Org  string `json:"org"`
+	Repo string `json:"repo"`
+	Pr   int    `json:"pr"`
 }
 
 func NewMetrics(file string) *Metrics {