diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index d7c4d41cfb..1290e8e7de 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -92,7 +92,7 @@ jobs:
   arm64-integration-tests:
     uses: ./.github/workflows/integration-tests-vm-type.yml
     if: |
-      github.event_name != 'pull_request' ||
+      github.event_name != 'pull_request' || inputs.is-konflux ||
       contains(github.event.pull_request.labels.*.name, 'run-multiarch-builds')
     strategy:
       # ensure that if one part of the matrix fails, the
@@ -117,7 +117,7 @@ jobs:
   s390x-integration-tests:
     uses: ./.github/workflows/integration-tests-vm-type.yml
     if: |
-      github.event_name != 'pull_request' ||
+      github.event_name != 'pull_request' || inputs.is-konflux ||
       contains(github.event.pull_request.labels.*.name, 'run-multiarch-builds')
     with:
       vm_type: rhel-s390x
@@ -131,7 +131,7 @@ jobs:
   ppc64le-integration-tests:
     uses: ./.github/workflows/integration-tests-vm-type.yml
     if: |
-      github.event_name != 'pull_request' ||
+      github.event_name != 'pull_request' || inputs.is-konflux ||
       contains(github.event.pull_request.labels.*.name, 'run-multiarch-builds')
     with:
       vm_type: rhel-ppc64le
diff --git a/.tekton/collector-component-pipeline.yaml b/.tekton/collector-component-pipeline.yaml
index dce2daa2c5..0281708c1f 100644
--- a/.tekton/collector-component-pipeline.yaml
+++ b/.tekton/collector-component-pipeline.yaml
@@ -208,6 +208,9 @@ spec:
       - name: kind
         value: task
       resolver: bundles
+    workspaces:
+    - name: git-basic-auth
+      workspace: git-auth
 
   - name: build-container-amd64
     params:
@@ -394,6 +397,8 @@ spec:
       - $(tasks.build-container-s390x.results.IMAGE_REF)
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
+    - name: IMAGE_EXPIRES_AFTER
+      value: $(params.image-expires-after)
     taskRef:
       params:
       - name: name
@@ -425,6 +430,8 @@ spec:
       - $(tasks.build-container-s390x.results.IMAGE_REF)
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
+    - name: IMAGE_EXPIRES_AFTER
+      value: $(params.image-expires-after)
     taskRef:
       params:
       - name: name
@@ -526,6 +533,8 @@ spec:
     params:
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
+    - name: CACHI2_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
     - name: image-digest
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
@@ -583,3 +592,25 @@ spec:
     - input: $(params.skip-checks)
       operator: in
       values: ["false"]
+
+  - name: push-dockerfile
+    params:
+    - name: IMAGE
+      value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: IMAGE_DIGEST
+      value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+    - name: DOCKERFILE
+      value: $(params.dockerfile)
+    - name: CONTEXT
+      value: $(params.path-context)
+    - name: SOURCE_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
+    taskRef:
+      params:
+      - name: name
+        value: push-dockerfile-oci-ta
+      - name: bundle
+        value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:a28f33b69b270c4e8def293ff6d19ecc9789e1fee5a5929f1250a2e6cbabed81
+      - name: kind
+        value: task
+      resolver: bundles
diff --git a/.tekton/determine-image-tag-task.yaml b/.tekton/determine-image-tag-task.yaml
index 7488ef4709..1ae5c2951f 100644
--- a/.tekton/determine-image-tag-task.yaml
+++ b/.tekton/determine-image-tag-task.yaml
@@ -41,4 +41,15 @@ spec:
       dnf -y install git make
 
       .konflux/scripts/fail-build-if-git-is-dirty.sh
-      echo -n "$(make --quiet --no-print-directory tag)$(params.TAG_SUFFIX)" | tee "$(results.IMAGE_TAG.path)"
+
+      # First, try take git tag if it's a tagged commit.
+      tag="$(git tag --points-at)"
+      if [[ -z "$tag" ]]; then
+        # If not, use make target's output.
+        tag="$(make --quiet --no-print-directory tag)"
+      elif [[ "$(wc -l <<< "$tag")" -gt 1 ]]; then
+        >&2 echo -e "Error: the HEAD commit has multiple tags, don't know which one to choose:\n$tag"
+        exit 5
+      fi
+
+      echo -n "${tag}$(params.TAG_SUFFIX)" | tee "$(results.IMAGE_TAG.path)"
diff --git a/builder/install/40-civetweb.sh b/builder/install/40-civetweb.sh
index dbae5f092b..3c36e52a8b 100755
--- a/builder/install/40-civetweb.sh
+++ b/builder/install/40-civetweb.sh
@@ -8,5 +8,12 @@ cp LICENSE.md "${LICENSE_DIR}/CivetWeb-${CIVETWEB_VERSION}"
 
 mkdir cmake-build
 cd cmake-build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCIVETWEB_ENABLE_CXX=ON -DBUILD_SHARED_LIBS:BOOL=NO -DCIVETWEB_BUILD_TESTING=NO ..
+cmake -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DCIVETWEB_ENABLE_CXX=ON \
+    -DBUILD_SHARED_LIBS:BOOL=NO \
+    -DCIVETWEB_BUILD_TESTING=NO \
+    -DCIVETWEB_ENABLE_IPV6=NO \
+    -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=NO \
+    ..
 cmake --build . --target install ${NPROCS:+-j ${NPROCS}}
diff --git a/builder/install/99-strip-binaries.sh b/builder/install/99-strip-binaries.sh
deleted file mode 100755
index 7a1e6e2ac6..0000000000
--- a/builder/install/99-strip-binaries.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-while read -r f; do
-    [[ -f "$f" ]] || continue
-    # Only strip executable files that are ELFs, as well as anything that looks like a
-    # .so or .a file.
-    if [[ -x "$f" ]]; then
-        if ! cmp -s -n 4 "$f" <(echo -en '\x7fELF'); then
-            continue
-        fi
-    elif ! [[ "$f" =~ .*\.so(\.|$) || "$f" =~ .*\.a(\.|$) ]]; then
-        continue
-    fi
-
-    strip --strip-unneeded "$f"
-done < <(find /usr/local -type f)
diff --git a/builder/install/versions.sh b/builder/install/versions.sh
index fb3fd9cccc..e33a8043c6 100644
--- a/builder/install/versions.sh
+++ b/builder/install/versions.sh
@@ -5,10 +5,10 @@ export CARES_VERSION=1.34.2
 export GOOGLETEST_REVISION=release-1.10.0
 export GRPC_REVISION=v1.67.0
 export JSONCPP_REVISION=1.9.6
-export PROMETHEUS_CPP_REVISION=v0.9.0
+export PROMETHEUS_CPP_REVISION=v1.2.4
 export PROTOBUF_VERSION=v28.3
 export TBB_VERSION=2018_U5
-export CIVETWEB_VERSION=v1.15
+export CIVETWEB_VERSION=v1.16
 export ABSEIL_VERSION=20240722.0
 export VALIJSON_VERSION=0.6
 export RE2_VERSION=2022-06-01
diff --git a/builder/third_party/civetweb b/builder/third_party/civetweb
index eefb26f82b..d7ba35bbb6 160000
--- a/builder/third_party/civetweb
+++ b/builder/third_party/civetweb
@@ -1 +1 @@
-Subproject commit eefb26f82b233268fc98577d265352720d477ba4
+Subproject commit d7ba35bbb649209c66e582d5a0244ba988a15159
diff --git a/builder/third_party/prometheus-cpp b/builder/third_party/prometheus-cpp
index 76470b3ec0..ad99e21f47 160000
--- a/builder/third_party/prometheus-cpp
+++ b/builder/third_party/prometheus-cpp
@@ -1 +1 @@
-Subproject commit 76470b3ec024c8214e1f4253fb1f4c0b28d3df94
+Subproject commit ad99e21f4706193670c42b36c9824dc997f4c475