diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8be05f0..21dab32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,6 @@ workflow:
         - renovate.json
         - README.md
         - LICENSE
-        - .tekton/*
       when: never
     - when: always
 
diff --git a/.tekton/fedora-bootc-43-iot-pull-request.yaml b/.tekton/fedora-bootc-43-iot-pull-request.yaml
index 3d310ab..c7fb232 100644
--- a/.tekton/fedora-bootc-43-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-iot-pull-request.yaml
@@ -49,7 +49,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-iot
   - name: image-expires-after
     value: 5d
@@ -61,7 +61,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-iot-push.yaml b/.tekton/fedora-bootc-43-iot-push.yaml
index f027a70..d8fa686 100644
--- a/.tekton/fedora-bootc-43-iot-push.yaml
+++ b/.tekton/fedora-bootc-43-iot-push.yaml
@@ -48,7 +48,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-iot
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-iot:{{revision}}
@@ -58,7 +58,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-iot-renovate-push.yaml b/.tekton/fedora-bootc-43-iot-renovate-push.yaml
index 00c653d..39b270d 100644
--- a/.tekton/fedora-bootc-43-iot-renovate-push.yaml
+++ b/.tekton/fedora-bootc-43-iot-renovate-push.yaml
@@ -49,7 +49,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-iot
   - name: image-expires-after
     value: 5d
@@ -61,7 +61,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-43-minimal-plus-pull-request.yaml
index 5d89391..d3b1c84 100644
--- a/.tekton/fedora-bootc-43-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-minimal-plus-pull-request.yaml
@@ -49,7 +49,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-minimal-plus
   - name: image-expires-after
     value: 5d
@@ -61,7 +61,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-minimal-plus-push.yaml b/.tekton/fedora-bootc-43-minimal-plus-push.yaml
index e5b62b3..d25967c 100644
--- a/.tekton/fedora-bootc-43-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-43-minimal-plus-push.yaml
@@ -48,7 +48,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-minimal-plus
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal-plus:{{revision}}
@@ -58,7 +58,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-minimal-pull-request.yaml b/.tekton/fedora-bootc-43-minimal-pull-request.yaml
index 9a7a0be..fb7bd14 100644
--- a/.tekton/fedora-bootc-43-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-minimal-pull-request.yaml
@@ -47,7 +47,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-minimal
   - name: image-expires-after
     value: 5d
@@ -59,7 +59,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-minimal-push.yaml b/.tekton/fedora-bootc-43-minimal-push.yaml
index 690e055..0cff0b7 100644
--- a/.tekton/fedora-bootc-43-minimal-push.yaml
+++ b/.tekton/fedora-bootc-43-minimal-push.yaml
@@ -46,7 +46,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-minimal
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal:{{revision}}
@@ -56,7 +56,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-standard-pull-request.yaml b/.tekton/fedora-bootc-43-standard-pull-request.yaml
index adf02a7..2db7323 100644
--- a/.tekton/fedora-bootc-43-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-standard-pull-request.yaml
@@ -51,7 +51,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-standard
   - name: image-expires-after
     value: 5d
@@ -63,7 +63,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-43-standard-push.yaml b/.tekton/fedora-bootc-43-standard-push.yaml
index b89bb44..addb84e 100644
--- a/.tekton/fedora-bootc-43-standard-push.yaml
+++ b/.tekton/fedora-bootc-43-standard-push.yaml
@@ -50,7 +50,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260727.0@sha256:af8e3cce0623d775670a68562f69e1050805cdd5ba8799c05088e9acf3f372c0
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-43-compose:Fedora-43-updates-20260529.0@sha256:ec5b37a5a8b229c1d8b61669e1b910466cb4e8ac4b0dd3c9bb31d89bd8a37063
     - MANIFEST=fedora-standard
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-standard:{{revision}}
@@ -60,7 +60,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:8ff57394418faad7722c144f77494cf654007d60f63526357c007700bfc34edd
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-44-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-44-minimal-plus-pull-request.yaml
index d7631a5..3439d32 100644
--- a/.tekton/fedora-bootc-44-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-44-minimal-plus-pull-request.yaml
@@ -49,7 +49,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260827.0@sha256:2f39b27325602d36383d0a320edad60de595e0bafd8983f0a2aeeeb87d7e3b9d
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260530.0@sha256:afb045cbee8c326f0d82bb6dc3f9b14b13ac90c0a1a413f50471ccc68c2235e5
     - MANIFEST=fedora-minimal-plus
   - name: image-expires-after
     value: 5d
@@ -61,7 +61,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-44-minimal-plus-push.yaml b/.tekton/fedora-bootc-44-minimal-plus-push.yaml
index c4b145d..5cb02b1 100644
--- a/.tekton/fedora-bootc-44-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-44-minimal-plus-push.yaml
@@ -48,7 +48,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260827.0@sha256:2f39b27325602d36383d0a320edad60de595e0bafd8983f0a2aeeeb87d7e3b9d
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260530.0@sha256:afb045cbee8c326f0d82bb6dc3f9b14b13ac90c0a1a413f50471ccc68c2235e5
     - MANIFEST=fedora-minimal-plus
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-44-minimal-plus:{{revision}}
@@ -58,7 +58,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-44-minimal-pull-request.yaml b/.tekton/fedora-bootc-44-minimal-pull-request.yaml
index 34b99c1..8c0ee4b 100644
--- a/.tekton/fedora-bootc-44-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-44-minimal-pull-request.yaml
@@ -47,7 +47,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260827.0@sha256:2f39b27325602d36383d0a320edad60de595e0bafd8983f0a2aeeeb87d7e3b9d
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260530.0@sha256:afb045cbee8c326f0d82bb6dc3f9b14b13ac90c0a1a413f50471ccc68c2235e5
     - MANIFEST=fedora-minimal
   - name: image-expires-after
     value: 5d
@@ -59,7 +59,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-44-minimal-push.yaml b/.tekton/fedora-bootc-44-minimal-push.yaml
index a06712e..9e4257c 100644
--- a/.tekton/fedora-bootc-44-minimal-push.yaml
+++ b/.tekton/fedora-bootc-44-minimal-push.yaml
@@ -46,7 +46,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260827.0@sha256:2f39b27325602d36383d0a320edad60de595e0bafd8983f0a2aeeeb87d7e3b9d
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260530.0@sha256:afb045cbee8c326f0d82bb6dc3f9b14b13ac90c0a1a413f50471ccc68c2235e5
     - MANIFEST=fedora-minimal
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-44-minimal:{{revision}}
@@ -56,7 +56,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-44-standard-pull-request.yaml b/.tekton/fedora-bootc-44-standard-pull-request.yaml
index d1d9af2..08b0641 100644
--- a/.tekton/fedora-bootc-44-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-44-standard-pull-request.yaml
@@ -51,7 +51,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260827.0@sha256:2f39b27325602d36383d0a320edad60de595e0bafd8983f0a2aeeeb87d7e3b9d
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260530.0@sha256:afb045cbee8c326f0d82bb6dc3f9b14b13ac90c0a1a413f50471ccc68c2235e5
     - MANIFEST=fedora-standard
   - name: image-expires-after
     value: 5d
@@ -63,7 +63,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-44-standard-push.yaml b/.tekton/fedora-bootc-44-standard-push.yaml
index 337ab83..e9a945c 100644
--- a/.tekton/fedora-bootc-44-standard-push.yaml
+++ b/.tekton/fedora-bootc-44-standard-push.yaml
@@ -50,7 +50,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260827.0@sha256:2f39b27325602d36383d0a320edad60de595e0bafd8983f0a2aeeeb87d7e3b9d
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-44-compose:Fedora-44-updates-20260530.0@sha256:afb045cbee8c326f0d82bb6dc3f9b14b13ac90c0a1a413f50471ccc68c2235e5
     - MANIFEST=fedora-standard
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-44-standard:{{revision}}
@@ -60,7 +60,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-45-iot-pull-request.yaml b/.tekton/fedora-bootc-45-iot-pull-request.yaml
deleted file mode 100644
index 0475788..0000000
--- a/.tekton/fedora-bootc-45-iot-pull-request.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "pull_request" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-iot-pull-request.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "iot.yaml".pathChanged() ||
-        "iot/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-iot
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-iot-on-pull-request
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260821.n.0@sha256:55b3460339b8c7aa0a2511e33c623310e17b16118764011059b2e8f35c5bedaf
-    - MANIFEST=fedora-iot
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-iot:on-pr-{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:44d0e8034a19a1ced7817c117c9c15230def1f3e7941666a72a3e47919951f51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-iot
diff --git a/.tekton/fedora-bootc-45-iot-push.yaml b/.tekton/fedora-bootc-45-iot-push.yaml
deleted file mode 100644
index 65e6370..0000000
--- a/.tekton/fedora-bootc-45-iot-push.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "push" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-iot-push.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "iot.yaml".pathChanged() ||
-        "iot/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-iot
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-iot-on-push
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260821.n.0@sha256:55b3460339b8c7aa0a2511e33c623310e17b16118764011059b2e8f35c5bedaf
-    - MANIFEST=fedora-iot
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-iot:{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:44d0e8034a19a1ced7817c117c9c15230def1f3e7941666a72a3e47919951f51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-iot
diff --git a/.tekton/fedora-bootc-45-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-45-minimal-plus-pull-request.yaml
deleted file mode 100644
index c590839..0000000
--- a/.tekton/fedora-bootc-45-minimal-plus-pull-request.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "pull_request" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-minimal-plus-pull-request.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-minimal-plus
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-minimal-plus-on-pull-request
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260826.n.0@sha256:ae4bedc5740a4e3f984f879c66ca026aa94ce8aec641a804f4ede0bc4ddd2c19
-    - MANIFEST=fedora-minimal-plus
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-minimal-plus:on-pr-{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-minimal-plus
diff --git a/.tekton/fedora-bootc-45-minimal-plus-push.yaml b/.tekton/fedora-bootc-45-minimal-plus-push.yaml
deleted file mode 100644
index 766b64b..0000000
--- a/.tekton/fedora-bootc-45-minimal-plus-push.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "push" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-minimal-plus-push.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-minimal-plus
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-minimal-plus-on-push
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260826.n.0@sha256:ae4bedc5740a4e3f984f879c66ca026aa94ce8aec641a804f4ede0bc4ddd2c19
-    - MANIFEST=fedora-minimal-plus
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-minimal-plus:{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-minimal-plus
diff --git a/.tekton/fedora-bootc-45-minimal-pull-request.yaml b/.tekton/fedora-bootc-45-minimal-pull-request.yaml
deleted file mode 100644
index fc96291..0000000
--- a/.tekton/fedora-bootc-45-minimal-pull-request.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "pull_request" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-minimal-pull-request.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-minimal
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-minimal-on-pull-request
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260826.n.0@sha256:ae4bedc5740a4e3f984f879c66ca026aa94ce8aec641a804f4ede0bc4ddd2c19
-    - MANIFEST=fedora-minimal
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-minimal:on-pr-{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-minimal
diff --git a/.tekton/fedora-bootc-45-minimal-push.yaml b/.tekton/fedora-bootc-45-minimal-push.yaml
deleted file mode 100644
index 22afdff..0000000
--- a/.tekton/fedora-bootc-45-minimal-push.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "push" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-minimal-push.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-minimal
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-minimal-on-push
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260826.n.0@sha256:ae4bedc5740a4e3f984f879c66ca026aa94ce8aec641a804f4ede0bc4ddd2c19
-    - MANIFEST=fedora-minimal
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-minimal:{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-minimal
diff --git a/.tekton/fedora-bootc-45-standard-pull-request.yaml b/.tekton/fedora-bootc-45-standard-pull-request.yaml
deleted file mode 100644
index 78bd426..0000000
--- a/.tekton/fedora-bootc-45-standard-pull-request.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "pull_request" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-standard-pull-request.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "standard.yaml".pathChanged() ||
-        "standard/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-standard
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-standard-on-pull-request
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260826.n.0@sha256:ae4bedc5740a4e3f984f879c66ca026aa94ce8aec641a804f4ede0bc4ddd2c19
-    - MANIFEST=fedora-standard
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-standard:on-pr-{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-standard
diff --git a/.tekton/fedora-bootc-45-standard-push.yaml b/.tekton/fedora-bootc-45-standard-push.yaml
deleted file mode 100644
index b5f1f7b..0000000
--- a/.tekton/fedora-bootc-45-standard-push.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "push" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-45-standard-push.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/generic.yaml".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "standard.yaml".pathChanged() ||
-        "standard/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-45
-    appstudio.openshift.io/component: fedora-bootc-45-standard
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-45-standard-on-push
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-45-compose:Fedora-45-20260826.n.0@sha256:ae4bedc5740a4e3f984f879c66ca026aa94ce8aec641a804f4ede0bc4ddd2c19
-    - MANIFEST=fedora-standard
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-45-standard:{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=45
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-45-standard
diff --git a/.tekton/fedora-bootc-eln-standard-pull-request.yaml b/.tekton/fedora-bootc-eln-standard-pull-request.yaml
deleted file mode 100644
index b7a7f56..0000000
--- a/.tekton/fedora-bootc-eln-standard-pull-request.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "pull_request" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-eln-standard-pull-request.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/eln.yaml".pathChanged() ||
-        "fedora-eln.yaml".pathChanged() ||
-        "eln/***".pathChanged() ||
-        "standard.yaml".pathChanged() ||
-        "standard/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-eln
-    appstudio.openshift.io/component: fedora-bootc-eln-standard
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-eln-standard-on-pull-request
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-eln-compose:Fedora-eln-20260802.n.0@sha256:12f9b31a07ea270b65d5869a904fd1509c56b470df6c8f2586492fc0f006f213
-    - MANIFEST=fedora-eln
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-eln-standard:on-pr-{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=eln
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:c587d9400c89e21225fee03a080dcb0816919d39770b6af0cd6f990c7f8404b8
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-eln-standard
diff --git a/.tekton/fedora-bootc-eln-standard-push.yaml b/.tekton/fedora-bootc-eln-standard-push.yaml
deleted file mode 100644
index b239205..0000000
--- a/.tekton/fedora-bootc-eln-standard-push.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "push" && target_branch == "main")
-      ) && (
-        ".tekton/fedora-bootc-eln-standard-push.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/eln.yaml".pathChanged() ||
-        "fedora-eln.yaml".pathChanged() ||
-        "eln/***".pathChanged() ||
-        "standard.yaml".pathChanged() ||
-        "standard/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged()
-      )
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-eln
-    appstudio.openshift.io/component: fedora-bootc-eln-standard
-    pipelines.appstudio.openshift.io/type: build
-  name: fedora-bootc-eln-standard-on-push
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-eln-compose:Fedora-eln-20260802.n.0@sha256:12f9b31a07ea270b65d5869a904fd1509c56b470df6c8f2586492fc0f006f213
-    - MANIFEST=fedora-eln
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-eln-standard:{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=eln
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:c587d9400c89e21225fee03a080dcb0816919d39770b6af0cd6f990c7f8404b8
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-eln-standard
diff --git a/.tekton/fedora-bootc-eln-standard-renovate-push.yaml b/.tekton/fedora-bootc-eln-standard-renovate-push.yaml
deleted file mode 100644
index 953bbd6..0000000
--- a/.tekton/fedora-bootc-eln-standard-renovate-push.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/-/tree/{{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      (
-        (event == "push" && target_branch.startsWith("renovate/"))
-      ) && (
-        ".tekton/fedora-bootc-eln-standard-renovate-push.yaml".pathChanged() ||
-        "Containerfile".pathChanged() ||
-        "bootc-base-imagectl".pathChanged() ||
-        "install-manifests".pathChanged() ||
-        "fedora-includes/eln.yaml".pathChanged() ||
-        "fedora-eln.yaml".pathChanged() ||
-        "eln/***".pathChanged() ||
-        "standard.yaml".pathChanged() ||
-        "standard/***".pathChanged() ||
-        "minimal-plus.hidden.yaml".pathChanged() ||
-        "minimal-plus/***".pathChanged() ||
-        "minimal.yaml".pathChanged() ||
-        "minimal/***".pathChanged()
-      ) && true == false
-    test.appstudio.openshift.io/comment_strategy: "disable_all"
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fedora-bootc-eln
-    appstudio.openshift.io/component: fedora-bootc-eln-standard
-    pipelines.appstudio.openshift.io/type: build
-    release.appstudio.openshift.io/auto-release: "false"
-  name: fedora-bootc-eln-standard-renovate-on-push
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: build-platforms
-    value:
-    - linux/amd64
-    - linux/arm64
-    - linux/ppc64le
-    - linux/s390x
-  - name: dockerfile
-    value: Containerfile
-  - name: path-context
-    value: .
-  - name: privileged-nested
-    value: true
-  - name: build-args
-    value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-eln-compose:Fedora-eln-20260802.n.0@sha256:12f9b31a07ea270b65d5869a904fd1509c56b470df6c8f2586492fc0f006f213
-    - MANIFEST=fedora-eln
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-eln-standard:{{revision}}
-  - name: labels
-    value:
-      - org.opencontainers.image.version=eln
-  pipelineRef:
-    params:
-    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:c587d9400c89e21225fee03a080dcb0816919d39770b6af0cd6f990c7f8404b8
-    - name: name
-      value: buildah-build-bootc-multi-platform-oci-ta
-    - name: kind
-      value: pipeline
-    resolver: bundles
-  timeouts:
-    pipeline: 6h
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fedora-bootc-eln-standard
diff --git a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
index b351374..f34bb4a 100644
--- a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
@@ -57,7 +57,7 @@ spec:
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-iot:on-pr-{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
diff --git a/.tekton/fedora-bootc-rawhide-iot-push.yaml b/.tekton/fedora-bootc-rawhide-iot-push.yaml
index 89e9523..d060998 100644
--- a/.tekton/fedora-bootc-rawhide-iot-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml
@@ -54,7 +54,7 @@ spec:
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-iot:{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
index 9fb1b50..447c330 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
@@ -49,7 +49,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260827.n.0@sha256:fcfd7db08ce2a2bf993fb11a15d21490b06017d879ece5d62e5d797107e3f9ab
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260529.n.0@sha256:2378f2bd0ad2fbd8856e14ca984af8158952044442063392ae5472a1aedee8f8
     - MANIFEST=fedora-minimal-plus
   - name: image-expires-after
     value: 5d
@@ -57,11 +57,11 @@ spec:
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal-plus:on-pr-{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
index 2794cc9..f0badb5 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
@@ -48,17 +48,17 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260827.n.0@sha256:fcfd7db08ce2a2bf993fb11a15d21490b06017d879ece5d62e5d797107e3f9ab
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260529.n.0@sha256:2378f2bd0ad2fbd8856e14ca984af8158952044442063392ae5472a1aedee8f8
     - MANIFEST=fedora-minimal-plus
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal-plus:{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
index 58a8164..48b8f72 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
@@ -47,7 +47,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260827.n.0@sha256:fcfd7db08ce2a2bf993fb11a15d21490b06017d879ece5d62e5d797107e3f9ab
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260529.n.0@sha256:2378f2bd0ad2fbd8856e14ca984af8158952044442063392ae5472a1aedee8f8
     - MANIFEST=fedora-minimal
   - name: image-expires-after
     value: 5d
@@ -55,11 +55,11 @@ spec:
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal:on-pr-{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
index ef33c65..7231026 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
@@ -46,17 +46,17 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260827.n.0@sha256:fcfd7db08ce2a2bf993fb11a15d21490b06017d879ece5d62e5d797107e3f9ab
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260529.n.0@sha256:2378f2bd0ad2fbd8856e14ca984af8158952044442063392ae5472a1aedee8f8
     - MANIFEST=fedora-minimal
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal:{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
index 771cf13..4716101 100644
--- a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
@@ -51,7 +51,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260827.n.0@sha256:fcfd7db08ce2a2bf993fb11a15d21490b06017d879ece5d62e5d797107e3f9ab
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260529.n.0@sha256:2378f2bd0ad2fbd8856e14ca984af8158952044442063392ae5472a1aedee8f8
     - MANIFEST=fedora-standard
   - name: image-expires-after
     value: 5d
@@ -59,11 +59,11 @@ spec:
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-standard:on-pr-{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-rawhide-standard-push.yaml b/.tekton/fedora-bootc-rawhide-standard-push.yaml
index 451d569..bcda0a1 100644
--- a/.tekton/fedora-bootc-rawhide-standard-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml
@@ -50,17 +50,17 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260827.n.0@sha256:fcfd7db08ce2a2bf993fb11a15d21490b06017d879ece5d62e5d797107e3f9ab
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-rawhide-compose:Fedora-Rawhide-20260529.n.0@sha256:2378f2bd0ad2fbd8856e14ca984af8158952044442063392ae5472a1aedee8f8
     - MANIFEST=fedora-standard
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-standard:{{revision}}
   - name: labels
     value:
-      - org.opencontainers.image.version=46
+      - org.opencontainers.image.version=45
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:9eb1decf91e0d678a613f7d4767091c05b37bec8a02163087254328f1e848c51
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:73024ae5cf5dd43b7c118324c99a5ede2f5f53c4d80ff064f0839c46a4403897
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/README.md b/README.md
index 11a2fb3..9df7915 100644
--- a/README.md
+++ b/README.md
@@ -47,8 +47,6 @@ interface, but may be used by other images in Fedora.
 
 **standard** inherits from **minimal-plus** and **minimal-plus** in turn inherit from **minimal**.
 
-- **eln** (manifest `fedora-eln`): Standard base image for Enterprise Linux Next (ELN). Uses distro `fedora` and inherits from standard; built with ELN repos. The image produced by this manifest is published as **fedora-eln**.
-
 All non-trivial changes to **minimal** and **minimal-plus** should be ACKed by at least
 one stakeholder of each Fedora variant WGs.
 
diff --git a/RELEASE.md b/RELEASE.md
index fe2f647..e11ca1c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -234,17 +234,18 @@ Add package rules for the new version in `renovate.json`. See the existing rules
 **Repository:** https://gitlab.com/fedora/infrastructure/konflux/tenants-config
 
 ```bash
-cd clusters/kflux-fedora-01/tenants/bootc-tenant/applications/fedora-bootc/
+cd cluster/kfluxfedorap01/bootc-tenant/applications/fedora-bootc/
 NEW_RELEASE=44
 
 # Copy from rawhide
 cp -r rawhide $NEW_RELEASE
 
 # Update version references
+sed -i "s/rawhide/$NEW_RELEASE/g" $NEW_RELEASE/**/*.yaml
 sed -i "s/compose-rawhide-id/compose-branched-id/" $NEW_RELEASE/releaseplans/release-to-quay-io/kustomization.yaml
-find "${NEW_RELEASE}/" -type f | xargs sed -i "s/rawhide/$NEW_RELEASE/g"
 ```
 
+#### Step 5: Register the New Version (tenants-config repo)
 
 Add the new version to `fedora-bootc/kustomization.yaml`:
 
@@ -258,8 +259,6 @@ resources:
   - "42"
 ```
 
-See [MR !237](https://gitlab.com/fedora/infrastructure/konflux/tenants-config/-/merge_requests/237) for reference (F45 addition).
-
 ### Removing an EOL Fedora Version from Konflux
 
 When a Fedora version reaches EOL (e.g., F42), follow these steps:
diff --git a/eln.yaml b/eln.yaml
deleted file mode 120000
index d35d04c..0000000
--- a/eln.yaml
+++ /dev/null
@@ -1 +0,0 @@
-fedora-eln.yaml
\ No newline at end of file
diff --git a/eln/20-rhel.toml b/eln/20-rhel.toml
deleted file mode 100644
index 32a278d..0000000
--- a/eln/20-rhel.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[install]
-root-fs-type = "xfs"
diff --git a/eln/bootc-install.yaml b/eln/bootc-install.yaml
deleted file mode 100644
index 59420d8..0000000
--- a/eln/bootc-install.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-add-files:
-  - - 20-rhel.toml
-    - /usr/lib/bootc/install/20-rhel.toml
diff --git a/eln/manifest.yaml b/eln/manifest.yaml
deleted file mode 100644
index a18488c..0000000
--- a/eln/manifest.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-metadata:
-  summary: |
-    Standard bootc base image for Enterprise Linux Next (ELN).
-    This manifest is the source for the image published as fedora-eln.
-    ELN is the Fedora package set (rawhide sources, ELN buildroot/compose).
-
-include:
-  - ../standard/manifest.yaml
-  - bootc-install.yaml
diff --git a/fedora-44.yaml b/fedora-44.yaml
index 912f7ea..3df73a4 100644
--- a/fedora-44.yaml
+++ b/fedora-44.yaml
@@ -2,6 +2,5 @@
 # will be removed in the future.
 releasever: 44
 repos:
-  - fedora
-  - fedora-updates
+  - fedora-devel
 include: fedora-bootc.yaml
diff --git a/fedora-45.yaml b/fedora-45.yaml
deleted file mode 100644
index 9c86c40..0000000
--- a/fedora-45.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# NB: This treefile is used by the legacy pungi path only to build tier-1. It
-# will be removed in the future.
-releasever: 45
-repos:
-  - fedora-devel
-include: fedora-bootc.yaml
diff --git a/fedora-eln.yaml b/fedora-eln.yaml
deleted file mode 100644
index 12e224b..0000000
--- a/fedora-eln.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-repos:
-  - eln-baseos
-  - eln-appstream
-include:
-  - fedora-includes/eln.yaml
-  - eln/manifest.yaml
diff --git a/fedora-includes/eln.yaml b/fedora-includes/eln.yaml
deleted file mode 100644
index 4b1bcf4..0000000
--- a/fedora-includes/eln.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# ELN uses the same distro variable as Fedora: ELN is a compose of Fedora
-# Rawhide sources (see docs.fedoraproject.org/en-US/eln/). Repos come from
-# REPOS_IMAGE at build time; we do not add fedora-repos-archive here.
-variables:
-  distro: "fedora"
-
-packages: []
diff --git a/install-manifests b/install-manifests
index 89c1b3b..f36a442 100755
--- a/install-manifests
+++ b/install-manifests
@@ -16,12 +16,6 @@ for image in minimal standard minimal-plus iot; do
     # And the legacy `fedora-` prefixed names
     cp -a fedora-$image.yaml $manifestdir/
 done
-# ELN is rawhide-only and should be removed when stable branches are created
-# (manually remove eln/ directory and fedora-eln.yaml when branching for new releases)
-if [ -d eln ]; then
-    cp -a eln $manifestdir/
-    cp -a fedora-eln.yaml $manifestdir/
-fi
 # Set the default
 ln -s fedora-standard.yaml $manifestdir/default.yaml
 # And install dependency manifests
diff --git a/minimal/bootc.yaml b/minimal/bootc.yaml
index 3975c14..128afd3 100644
--- a/minimal/bootc.yaml
+++ b/minimal/bootc.yaml
@@ -2,10 +2,15 @@
 packages:
  # systemd. Also name systemd-pam because it was dropped to a recommends
  # but we still want it for handling user logins/sessions.
- # dbus is required per https://bugzilla.redhat.com/show_bug.cgi?id=2507313
- - systemd systemd-pam dbus
+ - systemd systemd-pam
  # bootc itself.
  - bootc
  # Required by bootc install, sgdisk has been replaced by Rust crate
  # in bootc https://github.com/containers/bootc/pull/775
  - xfsprogs e2fsprogs dosfstools
+
+exclude-packages:
+  # Exclude kernel-debug-core to make sure that it doesn't somehow get
+  # chosen as the package to satisfy the `kernel-core` dependency from
+  # the kernel package.
+  - kernel-debug-core
diff --git a/minimal/kernel.yaml b/minimal/kernel.yaml
index 8921348..0dd777d 100644
--- a/minimal/kernel.yaml
+++ b/minimal/kernel.yaml
@@ -4,9 +4,3 @@ packages:
 
 exclude-packages:
   - kernel-debug
-  - kernel-debug-core
-  - kernel-debug-modules
-  - kernel-debug-modules-core
-  - kernel-debug-modules-extra
-  - kernel-debug-uki-virt
-  - kernel-debug-uki-virt-addons
diff --git a/renovate.json b/renovate.json
index 50ab8d0..d3f8cc6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -11,8 +11,6 @@
     "- Fedora 43 REPOS_IMAGE: at any time",
     "- Fedora 44 bootc-pipeline: 2-5 AM UTC daily",
     "- Fedora 44 REPOS_IMAGE: at any time",
-    "- Fedora 45 bootc-pipeline: 2-5 AM UTC daily",
-    "- Fedora 45 REPOS_IMAGE: at any time",
     "- Rawhide bootc-pipeline: 2-5 AM UTC daily",
     "- Rawhide REPOS_IMAGE: at any time",
     "",
@@ -65,11 +63,11 @@
   "packageRules": [
     {
       "description": [
-        "Disable REPOS_IMAGE updates for 44-iot, 45-iot and rawhide-iot tekton files",
+        "Disable REPOS_IMAGE updates for 44-iot and rawhide-iot tekton files",
         "until we fix https://gitlab.com/fedora/bootc/base-images/-/issues/74"
       ],
       "matchManagers": ["custom.regex", "tekton"],
-      "matchFileNames": [".tekton/*-44-iot-*", ".tekton/*-45-iot-*", ".tekton/*-rawhide-iot-*"],
+      "matchFileNames": [".tekton/*-44-iot-*", ".tekton/*-rawhide-iot-*"],
       "enabled": false
     },
     {
@@ -130,35 +128,6 @@
       "additionalBranchPrefix": "",
       "automerge": true
     },
-    {
-      "matchManagers": ["tekton"],
-      "matchPackageNames": ["/quay.io/bootc-devel/tekton-catalog/"],
-      "matchFileNames": [".tekton/fedora-bootc-45-*"],
-      "groupName": "Fedora 45 bootc-pipeline",
-      "groupSlug": "fedora-45-bootc-pipeline",
-      "branchPrefix": "renovate/fedora-45/",
-      "commitMessageTopic": "Fedora 45 bootc build pipeline",
-      "schedule": ["after 2am and before 5am"],
-      "timezone": "UTC",
-      "recreateWhen": "always",
-      "rebaseWhen": "always",
-      "additionalBranchPrefix": "",
-      "automerge": true
-    },
-    {
-      "matchManagers": ["custom.regex"],
-      "matchPackageNames": ["/quay.io/bootc-devel/fedora-bootc-45-compose/"],
-      "matchFileNames": [".tekton/fedora-bootc-45-*"],
-      "groupName": "Fedora 45 REPOS_IMAGE",
-      "groupSlug": "fedora-45-repos-image",
-      "branchPrefix": "renovate/fedora-45/",
-      "commitMessageTopic": "Fedora 45 REPOS_IMAGE",
-      "schedule": ["at any time"],
-      "recreateWhen": "always",
-      "rebaseWhen": "never",
-      "additionalBranchPrefix": "",
-      "automerge": true
-    },
     {
       "matchManagers": ["tekton"],
       "matchPackageNames": ["/quay.io/bootc-devel/tekton-catalog/"],
@@ -187,17 +156,6 @@
       "rebaseWhen": "never",
       "additionalBranchPrefix": "",
       "automerge": true
-    },
-    {
-      "matchPackageNames": [
-        "/quay.io/bootc-devel/fedora-bootc-eln-compose/"
-      ],
-      "groupName": "Fedora ELN compose dependencies",
-      "groupSlug": "fedora-eln-compose-dependencies",
-      "schedule": [
-        "at any time"
-      ],
-      "automerge": true
     }
   ]
 }
diff --git a/standard/initramfs-full.yaml b/standard/initramfs-full.yaml
index cc9179d..381fe32 100644
--- a/standard/initramfs-full.yaml
+++ b/standard/initramfs-full.yaml
@@ -7,14 +7,7 @@ postprocess:
     cat > /usr/lib/dracut/dracut.conf.d/30-bootc-standard.conf << 'EOF'
     add_dracutmodules+=" lvm crypt fips "
     EOF
-    # Clevis in initramfs for LUKS auto-unlock.
-    # clevis-pin-tpm2 is only on x86_64/aarch64 (TPM2 hardware arches).
-    if test -x /usr/bin/clevis-pin-tpm2; then
-      cat > /usr/lib/dracut/dracut.conf.d/50-bootc-clevis.conf << 'EOF'
-      add_dracutmodules+=" clevis clevis-pin-tpm2 "
+    cat > /usr/lib/dracut/dracut.conf.d/50-bootc-clevis.conf << 'EOF'
+    # Clevis in initramfs for TPM2-bound LUKS (needs clevis-dracut, clevis-pin-tpm2)
+    add_dracutmodules+=" clevis clevis-pin-tpm2 "
     EOF
-    else
-      cat > /usr/lib/dracut/dracut.conf.d/50-bootc-clevis.conf << 'EOF'
-      add_dracutmodules+=" clevis "
-    EOF
-    fi
diff --git a/standard/manifest.yaml b/standard/manifest.yaml
index 3cea76c..da2a7cb 100644
--- a/standard/manifest.yaml
+++ b/standard/manifest.yaml
@@ -43,8 +43,9 @@ packages:
   - sos
   # Make Ansible "package_facts" builtin work by default
   - python3-rpm
-  # Initramfs Clevis for LUKS auto-unlock (dracut modules wired in initramfs-full.yaml)
+  # Initramfs Clevis + TPM2 pin for LUKS auto-unlock (dracut modules wired in initramfs-full.yaml)
   - clevis-dracut
+  - clevis-pin-tpm2
   # Used by admins interactively
   - man-db
 
@@ -52,8 +53,6 @@ packages:
 packages-x86_64:
   - irqbalance
   - WALinuxAgent-udev
-  # TPM2 pin for Clevis LUKS auto-unlock
-  - clevis-pin-tpm2
 packages-ppc64le:
   - irqbalance
   - librtas
@@ -62,8 +61,6 @@ packages-ppc64le:
 packages-aarch64:
   - irqbalance
   - WALinuxAgent-udev
-  # TPM2 pin for Clevis LUKS auto-unlock
-  - clevis-pin-tpm2
 
 # Things we don't expect to ship on the host.  We currently
 # have recommends: false so these could only come in via
diff --git a/tests/Containerfile.test-derive b/tests/Containerfile.test-derive
index 72864ff..07cb9bc 100644
--- a/tests/Containerfile.test-derive
+++ b/tests/Containerfile.test-derive
@@ -1,12 +1,13 @@
-# This test case exercises using the fedora-bootc image as a builder to
-# generate a minimal target image, and then further extends it in a secondary
-# phase.
+# This test case exercises using the fedora-bootc image as a builder
+# to generate a minimal target image derived from CentOS Stream 10 content,
+# and then further extends it in a secondary phase.
+FROM quay.io/fedora/fedora-bootc:rawhide as repos
 
 # This is intentionally a locally built image
 FROM localhost/fedora-bootc as builder
-RUN <<EORUN
+RUN --mount=type=bind,from=repos,src=/,dst=/repos,rw <<EORUN
 echo -e '--install\nltrace' > args.txt
-/usr/libexec/bootc-base-imagectl --args-file args.txt build-rootfs --manifest=standard/manifest /target-rootfs
+/usr/libexec/bootc-base-imagectl --args-file args.txt build-rootfs --manifest=standard/manifest /repos /target-rootfs
 EORUN
 
 # This pulls in the rootfs generated in the previous step
diff --git a/tests/Containerfile.test-sysusers b/tests/Containerfile.test-sysusers
index 37165e0..53e255b 100644
--- a/tests/Containerfile.test-sysusers
+++ b/tests/Containerfile.test-sysusers
@@ -1,14 +1,15 @@
 # This test case exercises --sysusers.
+FROM quay.io/fedora/fedora-bootc:rawhide as repos
 
 # This is intentionally a locally built image
 FROM localhost/fedora-bootc as builder
-RUN <<EORUN
+RUN --mount=type=bind,from=repos,src=/,dst=/repos,rw <<EORUN
 mkdir -p overlay/usr/lib/sysusers.d
 cat > overlay/usr/lib/sysusers.d/00-chrony.conf <<EOF
 g chrony 888
 u chrony 888:888 - - -
 EOF
-/usr/libexec/bootc-base-imagectl build-rootfs --manifest=standard/manifest /target-rootfs --sysusers --add-dir overlay
+/usr/libexec/bootc-base-imagectl build-rootfs --manifest=standard/manifest /repos /target-rootfs --sysusers --add-dir overlay
 EORUN
 
 # This pulls in the rootfs generated in the previous step