diff --git a/.tekton/rhel-10-star-pull-request.yaml b/.tekton/rhel-10-star-pull-request.yaml
index 3c024ed..685186a 100644
--- a/.tekton/rhel-10-star-pull-request.yaml
+++ b/.tekton/rhel-10-star-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rhel-10-workload-apps-unsorted
+    appstudio.openshift.io/application: rhel-10
     appstudio.openshift.io/component: rhel-10-star
     pipelines.appstudio.openshift.io/type: build
   name: rhel-10-star-on-pull-request
@@ -19,7 +19,7 @@ metadata:
 spec:
   params:
     - name: application
-      value: rhel-10-workload-apps-unsorted
+      value: rhel-10
     - name: package-name
       value: star
     - name: git-url
diff --git a/.tekton/rhel-10-star-push.yaml b/.tekton/rhel-10-star-push.yaml
index 23a068b..b546d66 100644
--- a/.tekton/rhel-10-star-push.yaml
+++ b/.tekton/rhel-10-star-push.yaml
@@ -7,10 +7,10 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{ revision }}'
     build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "c10s"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: rhel-10-workload-apps-unsorted
+    appstudio.openshift.io/application: rhel-10
     appstudio.openshift.io/component: rhel-10-star
     pipelines.appstudio.openshift.io/type: build
   name: rhel-10-star-on-push
@@ -18,7 +18,7 @@ metadata:
 spec:
   params:
     - name: application
-      value: rhel-10-workload-apps-unsorted
+      value: rhel-10
     - name: package-name
       value: star
     - name: git-url
diff --git a/star.spec b/star.spec
index beb5aa0..967dfaf 100644
--- a/star.spec
+++ b/star.spec
@@ -3,7 +3,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.6
-Release: 17%{?dist}.alma.1
+Release: 18%{?dist}.alma.1
 License: CDDL-1.0 AND GPL-2.0-only
 URL: http://freecode.com/projects/star
 Source: https://downloads.sourceforge.net/s-tar/%{name}-%{version}.tar.bz2
@@ -216,9 +216,12 @@ fi
 %{_sysconfdir}/rmt
 
 %changelog
-* Tue Feb 18 2025 Eduard Abdullin <eabdullin@almalinux.org> - 2:1.6-17.alma.1
+* Fri Mar 28 2025 Eduard Abdullin <eabdullin@almalinux.org> - 2:1.6-18.alma.1
 - Use x86_64 as target for x86_64_v2 arch
 
+* Thu Mar 27 2025 Michal Srb <michal@redhat.com> - 1.6-18
+- Rebuild for Konflux (Resolves: RHEL-84822)
+
 * Mon Feb 17 2025 Michal Srb <michal@redhat.com> - 1.6-17
 - rebuilt