diff --git a/deploy/registration-service/registration-service.yaml b/deploy/registration-service/registration-service.yaml
index f4a85ccca..d39198aa9 100644
--- a/deploy/registration-service/registration-service.yaml
+++ b/deploy/registration-service/registration-service.yaml
@@ -7,14 +7,14 @@ objects:
     kind: ServiceAccount
     metadata:
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
       name: registration-service
       namespace: ${NAMESPACE}
   - kind: Role
     apiVersion: rbac.authorization.k8s.io/v1
     metadata:
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
       name: registration-service
       namespace: ${NAMESPACE}
     rules:
@@ -62,7 +62,7 @@ objects:
     apiVersion: rbac.authorization.k8s.io/v1
     metadata:
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
       name: registration-service
       namespace: ${NAMESPACE}
     subjects:
@@ -76,7 +76,7 @@ objects:
     apiVersion: apps/v1
     metadata:
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
       name: registration-service
       namespace: ${NAMESPACE}
     spec:
@@ -147,7 +147,7 @@ objects:
     apiVersion: v1
     metadata:
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
         run: registration-service
       name: registration-service
       namespace: ${NAMESPACE}
@@ -170,7 +170,7 @@ objects:
       name: registration-service
       namespace: ${NAMESPACE}
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
         run: registration-service
     spec:
       ports:
@@ -190,7 +190,7 @@ objects:
       name: registration-service-metrics
       namespace: ${NAMESPACE}
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
         run: registration-service
     spec:
       ports:
@@ -208,7 +208,7 @@ objects:
     apiVersion: v1
     metadata:
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
         run: registration-service
       annotations:
         haproxy.router.openshift.io/timeout: 24h
@@ -232,7 +232,7 @@ objects:
       name: api
       namespace: ${NAMESPACE}
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
         run: registration-service
     spec:
       ports:
@@ -252,7 +252,7 @@ objects:
       name: proxy-metrics-service
       namespace: ${NAMESPACE}
       labels:
-        provider: codeready-toolchain
+        toolchain.dev.openshift.com/provider: codeready-toolchain
         run: proxy-metrics
     spec:
       ports: