diff --git a/Makefile b/Makefile
index 2e51add602..56d4396f9c 100644
--- a/Makefile
+++ b/Makefile
@@ -640,10 +640,7 @@ test/e2e/probe/run: IMAGE_REF="$(external_image_registry)/$(probe_image_reposito
 test/e2e/probe/run:
 	$(DOCKER) run \
 	-e QUOTA_TYPE="OCM" \
-	-e AUTH_TYPE="OCM" \
 	-e PROBE_NAME="e2e-probe-$$$$" \
-	-e OCM_USERNAME="${OCM_USERNAME}" \
-	-e OCM_TOKEN="${OCM_TOKEN}" \
 	-e FLEET_MANAGER_ENDPOINT="${FLEET_MANAGER_ENDPOINT}" \
 	--rm $(IMAGE_REF) \
 	run
diff --git a/probe/config/config.go b/probe/config/config.go
index 0e8dfb6ec0..778c624ac0 100644
--- a/probe/config/config.go
+++ b/probe/config/config.go
@@ -19,7 +19,6 @@ type Config struct {
 	FleetManagerEndpoint    string        `env:"FLEET_MANAGER_ENDPOINT" envDefault:"http://127.0.0.1:8000"`
 	MetricsAddress          string        `env:"METRICS_ADDRESS" envDefault:":7070"`
 	RHSSOClientID           string        `env:"RHSSO_SERVICE_ACCOUNT_CLIENT_ID"`
-	OCMUsername             string        `env:"OCM_USERNAME"`
 	ProbeName               string        `env:"PROBE_NAME" envDefault:"${HOSTNAME}" envExpand:"true"`
 	ProbeCleanUpTimeout     time.Duration `env:"PROBE_CLEANUP_TIMEOUT" envDefault:"5m"`
 	ProbeHTTPRequestTimeout time.Duration `env:"PROBE_HTTP_REQUEST_TIMEOUT" envDefault:"5s"`
@@ -65,11 +64,6 @@ func GetConfig() (*Config, error) {
 			configErrors.AddError(errors.New("RHSSO_SERVICE_ACCOUNT_CLIENT_ID unset in the environment"))
 		}
 		c.ProbeUsername = fmt.Sprintf("service-account-%s", c.RHSSOClientID)
-	case "OCM":
-		if c.OCMUsername == "" {
-			configErrors.AddError(errors.New("OCM_USERNAME unset in the environment"))
-		}
-		c.ProbeUsername = c.OCMUsername
 	default:
 		configErrors.AddError(errors.New("AUTH_TYPE not supported"))
 	}
diff --git a/templates/probe-template.yml b/templates/probe-template.yml
index 12c815838a..af9618de3c 100644
--- a/templates/probe-template.yml
+++ b/templates/probe-template.yml
@@ -65,17 +65,17 @@ objects:
                 - name: FLEET_MANAGER_ENDPOINT
                   value: ${FLEET_MANAGER_ENDPOINT}
                 - name: AUTH_TYPE
-                  value: OCM
-                - name: OCM_USERNAME
+                  value: RHSSO
+                - name: RHSSO_SERVICE_ACCOUNT_CLIENT_ID
                   valueFrom:
                     secretKeyRef:
                       name: probe-credentials
-                      key: OCM_USERNAME
-                - name: OCM_TOKEN
+                      key: RHSSO_SERVICE_ACCOUNT_CLIENT_ID
+                - name: RHSSO_SERVICE_ACCOUNT_CLIENT_SECRET
                   valueFrom:
                     secretKeyRef:
                       name: probe-credentials
-                      key: OCM_TOKEN
+                      key: RHSSO_SERVICE_ACCOUNT_CLIENT_SECRET
                 - name: CENTRAL_SPECS
                   value: ${CENTRAL_SPECS}
               ports: