diff --git a/.tekton/backfill-redis-1-0-gamma-pull-request.yaml b/.tekton/backfill-redis-1-0-gamma-pull-request.yaml
index 57575ad33..9efbc8753 100644
--- a/.tekton/backfill-redis-1-0-gamma-pull-request.yaml
+++ b/.tekton/backfill-redis-1-0-gamma-pull-request.yaml
@@ -8,13 +8,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "redhat-v1.3"
+      == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rekor-1-0-gamma
-    appstudio.openshift.io/component: backfill-redis-1-0-gamma
+    appstudio.openshift.io/application: rekor
+    appstudio.openshift.io/component: backfill-redis
     pipelines.appstudio.openshift.io/type: build
-  name: backfill-redis-1-0-gamma-on-pull-request
+  name: backfill-redis-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
@@ -25,7 +25,7 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor-1-0-gamma/backfill-redis-1-0-gamma:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor/backfill-redis:on-pr-{{revision}}
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/backfill-redis-1-0-gamma-push.yaml b/.tekton/backfill-redis-1-0-gamma-push.yaml
index 6d4db5ff0..6cdd85c08 100644
--- a/.tekton/backfill-redis-1-0-gamma-push.yaml
+++ b/.tekton/backfill-redis-1-0-gamma-push.yaml
@@ -7,13 +7,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "redhat-v1.3"
+      == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rekor-1-0-gamma
-    appstudio.openshift.io/component: backfill-redis-1-0-gamma
+    appstudio.openshift.io/application: rekor
+    appstudio.openshift.io/component: backfill-redis
     pipelines.appstudio.openshift.io/type: build
-  name: backfill-redis-1-0-gamma-on-push
+  name: backfill-redis-on-push
   namespace: rhtas-tenant
 spec:
   params:
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{repo_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor-1-0-gamma/backfill-redis-1-0-gamma:{{revision}}
+    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor/backfill-redis:{{revision}}
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/rekor-cli-1-3-pull-request.yaml b/.tekton/rekor-cli-1-3-pull-request.yaml
index da4fc8e75..c27312a1c 100644
--- a/.tekton/rekor-cli-1-3-pull-request.yaml
+++ b/.tekton/rekor-cli-1-3-pull-request.yaml
@@ -8,13 +8,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "redhat-v1.3"
+      == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: cli-1-0-gamma
-    appstudio.openshift.io/component: rekor-cli-1-3
+    appstudio.openshift.io/application: cli
+    appstudio.openshift.io/component: rekor-cli
     pipelines.appstudio.openshift.io/type: build
-  name: rekor-cli-1-3-on-pull-request
+  name: rekor-cli-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
@@ -25,7 +25,7 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhtas-tenant/cli-1-0-gamma/rekor-cli-1-3:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/rhtas-tenant/cli/rekor-cli:on-pr-{{revision}}
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/rekor-cli-1-3-push.yaml b/.tekton/rekor-cli-1-3-push.yaml
index e1bfa54d2..97140ef54 100644
--- a/.tekton/rekor-cli-1-3-push.yaml
+++ b/.tekton/rekor-cli-1-3-push.yaml
@@ -7,13 +7,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "redhat-v1.3"
+      == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: cli-1-0-gamma
-    appstudio.openshift.io/component: rekor-cli-1-3
+    appstudio.openshift.io/application: cli
+    appstudio.openshift.io/component: rekor-cli
     pipelines.appstudio.openshift.io/type: build
-  name: rekor-cli-1-3-on-push
+  name: rekor-cli-on-push
   namespace: rhtas-tenant
 spec:
   params:
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{repo_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhtas-tenant/cli-1-0-gamma/rekor-cli-1-3:{{revision}}
+    value: quay.io/redhat-user-workloads/rhtas-tenant/cli/rekor-cli:{{revision}}
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/rekor-server-1-0-gamma-pull-request.yaml b/.tekton/rekor-server-1-0-gamma-pull-request.yaml
index f810052aa..e2ab4759f 100644
--- a/.tekton/rekor-server-1-0-gamma-pull-request.yaml
+++ b/.tekton/rekor-server-1-0-gamma-pull-request.yaml
@@ -8,13 +8,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "redhat-v1.3"
+      == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rekor-1-0-gamma
-    appstudio.openshift.io/component: rekor-server-1-0-gamma
+    appstudio.openshift.io/application: rekor
+    appstudio.openshift.io/component: rekor-server
     pipelines.appstudio.openshift.io/type: build
-  name: rekor-server-1-0-gamma-on-pull-request
+  name: rekor-server-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
@@ -25,7 +25,7 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor-1-0-gamma/rekor-server-1-0-gamma:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor/rekor-server:on-pr-{{revision}}
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/rekor-server-1-0-gamma-push.yaml b/.tekton/rekor-server-1-0-gamma-push.yaml
index ccd773cbf..192ab88fe 100644
--- a/.tekton/rekor-server-1-0-gamma-push.yaml
+++ b/.tekton/rekor-server-1-0-gamma-push.yaml
@@ -7,13 +7,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "redhat-v1.3"
+      == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rekor-1-0-gamma
-    appstudio.openshift.io/component: rekor-server-1-0-gamma
+    appstudio.openshift.io/application: rekor
+    appstudio.openshift.io/component: rekor-server
     pipelines.appstudio.openshift.io/type: build
-  name: rekor-server-1-0-gamma-on-push
+  name: rekor-server-on-push
   namespace: rhtas-tenant
 spec:
   params:
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{repo_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor-1-0-gamma/rekor-server-1-0-gamma:{{revision}}
+    value: quay.io/redhat-user-workloads/rhtas-tenant/rekor/rekor-server:{{revision}}
   - name: path-context
     value: .
   - name: revision