diff --git a/.tekton/scanner-build.yaml b/.tekton/scanner-build.yaml
index 63ad14900..c3e61b6ff 100644
--- a/.tekton/scanner-build.yaml
+++ b/.tekton/scanner-build.yaml
@@ -20,8 +20,8 @@ metadata:
         )
       )
   labels:
-    appstudio.openshift.io/application: acs
-    appstudio.openshift.io/component: scanner
+    appstudio.openshift.io/application: acs-4-8
+    appstudio.openshift.io/component: scanner-4-8
     pipelines.appstudio.openshift.io/type: build
   name: scanner-on-push
   namespace: rh-acs-tenant
@@ -80,7 +80,7 @@ spec:
           cpu: 2
 
   taskRunTemplate:
-    serviceAccountName: build-pipeline-scanner
+    serviceAccountName: build-pipeline-scanner-4-8
 
   # Multiarch builds sometimes make the pipeline timeout after 1h.
   # Tagged builds wait for blobs to be published which takes about 1h.
diff --git a/.tekton/scanner-db-build.yaml b/.tekton/scanner-db-build.yaml
index 596558c8a..612279fb6 100644
--- a/.tekton/scanner-db-build.yaml
+++ b/.tekton/scanner-db-build.yaml
@@ -20,8 +20,8 @@ metadata:
         )
       )
   labels:
-    appstudio.openshift.io/application: acs
-    appstudio.openshift.io/component: scanner-db
+    appstudio.openshift.io/application: acs-4-8
+    appstudio.openshift.io/component: scanner-db-4-8
     pipelines.appstudio.openshift.io/type: build
   name: scanner-db-on-push
   namespace: rh-acs-tenant
@@ -65,7 +65,7 @@ spec:
       secretName: '{{ git_auth_secret }}'
 
   taskRunTemplate:
-    serviceAccountName: build-pipeline-scanner-db
+    serviceAccountName: build-pipeline-scanner-db-4-8
 
   # Tagged builds wait for blobs to be published which takes about 1h.
   timeouts:
diff --git a/.tekton/scanner-db-slim-build.yaml b/.tekton/scanner-db-slim-build.yaml
index 6dd5348f4..fa66c3f3b 100644
--- a/.tekton/scanner-db-slim-build.yaml
+++ b/.tekton/scanner-db-slim-build.yaml
@@ -20,8 +20,8 @@ metadata:
         )
       )
   labels:
-    appstudio.openshift.io/application: acs
-    appstudio.openshift.io/component: scanner-db-slim
+    appstudio.openshift.io/application: acs-4-8
+    appstudio.openshift.io/component: scanner-db-slim-4-8
     pipelines.appstudio.openshift.io/type: build
   name: scanner-db-slim-on-push
   namespace: rh-acs-tenant
@@ -65,7 +65,7 @@ spec:
       secretName: '{{ git_auth_secret }}'
 
   taskRunTemplate:
-    serviceAccountName: build-pipeline-scanner-db-slim
+    serviceAccountName: build-pipeline-scanner-db-slim-4-8
 
   timeouts:
     tasks: 1h
diff --git a/.tekton/scanner-slim-build.yaml b/.tekton/scanner-slim-build.yaml
index 8aed5db8c..c885563f7 100644
--- a/.tekton/scanner-slim-build.yaml
+++ b/.tekton/scanner-slim-build.yaml
@@ -20,8 +20,8 @@ metadata:
         )
       )
   labels:
-    appstudio.openshift.io/application: acs
-    appstudio.openshift.io/component: scanner-slim
+    appstudio.openshift.io/application: acs-4-8
+    appstudio.openshift.io/component: scanner-slim-4-8
     pipelines.appstudio.openshift.io/type: build
   name: scanner-slim-on-push
   namespace: rh-acs-tenant
@@ -80,7 +80,7 @@ spec:
           cpu: 2
 
   taskRunTemplate:
-    serviceAccountName: build-pipeline-scanner-slim
+    serviceAccountName: build-pipeline-scanner-slim-4-8
 
   # Multiarch builds sometimes make the pipeline timeout after 1h.
   timeouts: