diff --git a/.baseimage b/.baseimage
index 9729d433..3cb9424c 100644
--- a/.baseimage
+++ b/.baseimage
@@ -1,2 +1,2 @@
 sha256:cf095e5668919ba1b4ace3888107684ad9d587b1830d3eb56973e6a54f456e67
-61542ca28cbd1c6abc9d2256f2b651e0912390b95a7949db03b14cc8ed5810ec  -
+165b03727fc64d107d6126ce5009c7a23cdd20939989da58c6acb0fea1683966  -
diff --git a/.rhcicd/clowdapp.yaml b/.rhcicd/clowdapp.yaml
index dc3d37fd..f5726289 100644
--- a/.rhcicd/clowdapp.yaml
+++ b/.rhcicd/clowdapp.yaml
@@ -37,11 +37,11 @@ objects:
         image: ${IMAGE}:${IMAGE_TAG}
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ENGINE}
+            memory: ${MEMORY_REQUEST_ENGINE}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ENGINE}
+            memory: ${MEMORY_LIMIT_ENGINE}
         volumes:
         - name: certs
           emptyDir: {}
@@ -77,8 +77,6 @@ objects:
           value: ${EXTERNAL_LOGGING_LEVEL}
         - name: JAVA_OPTIONS
           value: ${JAVA_OPTIONS}
-        - name: GC_CONTAINER_OPTIONS
-          value: "-XX:+UseG1GC"
         - name: QUARKUS_HTTP_PORT
           value: "8000"
         - name: QUARKUS_LOG_CLOUDWATCH_ENABLED
@@ -100,10 +98,10 @@ parameters:
 - name: JAVA_OPTIONS
   description: Additional options to JDK runtime
   value: "-XX:+ExitOnOutOfMemoryError -Xms128m -Xmx512m"
-- name: CPU_LIMIT
+- name: CPU_LIMIT_ENGINE
   description: CPU limit
   value: 250m
-- name: CPU_REQUEST
+- name: CPU_REQUEST_ENGINE
   description: CPU request
   value: 125m
 - name: ENV_NAME
@@ -117,10 +115,10 @@ parameters:
   value: latest
 - name: EXTERNAL_LOGGING_LEVEL
   value: INFO
-- name: MEMORY_LIMIT
+- name: MEMORY_LIMIT_ENGINE
   description: Memory limit
   value: 1000Mi
-- name: MEMORY_REQUEST
+- name: MEMORY_REQUEST_ENGINE
   description: Memory request
   value: 500Mi
 - name: MIN_REPLICAS
diff --git a/.tekton/policies-engine-pull-request.yaml b/.tekton/policies-engine-pull-request.yaml
index f707aadf..f37602e0 100644
--- a/.tekton/policies-engine-pull-request.yaml
+++ b/.tekton/policies-engine-pull-request.yaml
@@ -242,7 +242,7 @@ spec:
         - name: name
           value: buildah
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:c3fb20564f297f8a5590db73f45910b1e6ec674dd4ef644779f95b60feca3e8b
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.3@sha256:2f07e7813b6f3d0cb26e41a3732ce813809963537b1926df7c24020c9867ea0b
         - name: kind
           value: task
         resolver: bundles
diff --git a/.tekton/policies-engine-push.yaml b/.tekton/policies-engine-push.yaml
index 68c782fc..f6a66e81 100644
--- a/.tekton/policies-engine-push.yaml
+++ b/.tekton/policies-engine-push.yaml
@@ -239,7 +239,7 @@ spec:
         - name: name
           value: buildah
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:c3fb20564f297f8a5590db73f45910b1e6ec674dd4ef644779f95b60feca3e8b
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.3@sha256:2f07e7813b6f3d0cb26e41a3732ce813809963537b1926df7c24020c9867ea0b
         - name: kind
           value: task
         resolver: bundles
diff --git a/pom.xml b/pom.xml
index 1a35a6b5..a4d7916f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
     <quarkus.platform.version>3.15.2.redhat-00003</quarkus.platform.version>
 
     <!-- Dependencies -->
-    <insights-notification-schemas-java.version>0.21</insights-notification-schemas-java.version>
+    <insights-notification-schemas-java.version>0.22</insights-notification-schemas-java.version>
     <redhat.event-schemas.version>1.4.11</redhat.event-schemas.version>
     <clowder-quarkus-config-source.version>2.6.1</clowder-quarkus-config-source.version>
     <quarkus-logging-cloudwatch.version>6.12.0</quarkus-logging-cloudwatch.version>