Aug 20th update

Merge pull request #174 from openappsec/orianelou-patch-6
Update docker-compose.yaml
2025-11-16 01:12:18 +03:00 · 2024-08-21 08:42:14 +00:00 · 2024-08-20 15:17:02 +03:00 · 2024-08-20 14:50:01 +03:00 · 2024-08-05 13:12:40 +03:00 · 2024-08-05 12:06:37 +03:00
725 changed files with 119250 additions and 105249 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.8.4)
 project (ngen)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-terminate")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fPIC -Wall -Wno-terminate")

 execute_process(COMMAND grep -c "Alpine Linux" /etc/os-release OUTPUT_VARIABLE IS_ALPINE)
 if(NOT IS_ALPINE EQUAL "0")
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ open-appsec GitHub includes four main repositories:

 ## Installing external dependencies

-Before compiling the services, you'll need to ensure the latest development versions of the following libraries:
+Before compiling the services, you'll need to ensure the latest development versions of the following libraries and tools:
 * Boost
 * OpenSSL
 * PCRE2
@@ -107,12 +107,13 @@ Before compiling the services, you'll need to ensure the latest development vers
 * Redis
 * Hiredis
 * MaxmindDB
+* yq

 An example of installing the packages on Alpine:

 ```bash
 $ apk update
- $ apk add boost-dev openssl-dev pcre2-dev libxml2-dev gtest-dev curl-dev hiredis-dev redis libmaxminddb-dev
+ $ apk add boost-dev openssl-dev pcre2-dev libxml2-dev gtest-dev curl-dev hiredis-dev redis libmaxminddb-dev yq
 ```

 ## Compiling and packaging the agent code
--- a/attachments/nginx/nginx_attachment_util/nginx_attachment_util.cc
+++ b/attachments/nginx/nginx_attachment_util/nginx_attachment_util.cc
@@ -155,6 +155,24 @@ getWaitingForVerdictThreadTimeout()
    return conf_data.getNumericalValue("waiting_for_verdict_thread_timeout_msec");
 }

+unsigned int
+getMinRetriesForVerdict()
+{
+    return conf_data.getNumericalValue("min_retries_for_verdict");
+}
+
+unsigned int
+getMaxRetriesForVerdict()
+{
+    return conf_data.getNumericalValue("max_retries_for_verdict");
+}
+
+unsigned int
+getReqBodySizeTrigger()
+{
+    return conf_data.getNumericalValue("body_size_trigger");
+}
+
 int
 isIPAddress(c_str ip_str)
 {
--- a/attachments/nginx/nginx_attachment_util/nginx_attachment_util_ut/nginx_attachment_util_ut.cc
+++ b/attachments/nginx/nginx_attachment_util/nginx_attachment_util_ut/nginx_attachment_util_ut.cc
@@ -63,7 +63,10 @@ TEST_F(HttpAttachmentUtilTest, GetValidAttachmentConfiguration)
            "\"waiting_for_verdict_thread_timeout_msec\": 75,\n"
            "\"req_header_thread_timeout_msec\": 10,\n"
            "\"ip_ranges\": " + createIPRangesString(ip_ranges) + ",\n"
-            "\"static_resources_path\": \"" + static_resources_path + "\""
+            "\"static_resources_path\": \"" + static_resources_path + "\",\n"
+            "\"min_retries_for_verdict\": 1,\n"
+            "\"max_retries_for_verdict\": 3,\n"
+            "\"body_size_trigger\": 777\n"
        "}\n";
    ofstream valid_configuration_file(attachment_configuration_file_name);
    valid_configuration_file << valid_configuration;
@@ -87,6 +90,9 @@ TEST_F(HttpAttachmentUtilTest, GetValidAttachmentConfiguration)
    EXPECT_EQ(getReqBodyThreadTimeout(), 155);
    EXPECT_EQ(getResHeaderThreadTimeout(), 1);
    EXPECT_EQ(getResBodyThreadTimeout(), 0);
+    EXPECT_EQ(getMinRetriesForVerdict(), 1);
+    EXPECT_EQ(getMaxRetriesForVerdict(), 3);
+    EXPECT_EQ(getReqBodySizeTrigger(), 777);
    EXPECT_EQ(getWaitingForVerdictThreadTimeout(), 75);
    EXPECT_EQ(getInspectionMode(), ngx_http_inspection_mode::BLOCKING_THREAD);

--- a/build_system/apisix/apisix-standalone.yaml
+++ b/build_system/apisix/apisix-standalone.yaml
@@ -0,0 +1,11 @@
+# example local declarative configuration file for apisix in standalone mode
+
+routes:
+  -
+    uri: /anything
+    upstream:
+        nodes:
+            "httpbin.org:80": 1
+        type: roundrobin
+
+#END
--- a/build_system/apisix/docker-compose.yaml
+++ b/build_system/apisix/docker-compose.yaml
@@ -0,0 +1,46 @@
+# Copyright (C) 2022 Check Point Software Technologies Ltd. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: "3"
+
+services:
+  apisix:
+    container_name: apisix
+    image: "ghcr.io/openappsec/apisix-attachment:latest"
+    ipc: host
+    restart: always
+    volumes:
+      - ./apisix-localconfig/apisix-standalone.yaml:/usr/local/apisix/conf/apisix.yaml:ro
+    environment:
+      - APISIX_STAND_ALONE=true
+    ports:
+      - "9180:9180/tcp"
+      - "9080:9080/tcp"
+      - "9091:9091/tcp"
+      - "9443:9443/tcp"
+
+  appsec-agent:
+    container_name: appsec-agent
+    image: 'ghcr.io/openappsec/agent:latest'
+    ipc: host
+    restart: unless-stopped
+    environment:
+      # adjust with your own email below
+      - user_email=user@email.com
+      - registered_server="APISIX Server"
+    volumes:
+      - ./appsec-config:/etc/cp/conf
+      - ./appsec-data:/etc/cp/data
+      - ./appsec-logs:/var/log/nano_agent
+      - ./appsec-localconfig:/ext/appsec
+    command: /cp-nano-agent --standalone
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/Chart.lock
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
  repository: https://charts.bitnami.com/bitnami
  version: 12.2.8
 digest: sha256:0d13b8b0c66b8e18781eac510ce58b069518ff14a6a15ad90375e7f0ffad71fe
-generated: "2024-02-18T16:45:15.395307713Z"
+generated: "2024-03-26T14:53:49.928153508Z"
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/Chart.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/Chart.yaml
@@ -1,7 +1,5 @@
 annotations:
-  artifacthub.io/changes: |-
-    - "update web hook cert gen to latest release v20231226-1a7112e06"
-    - "Update Ingress-Nginx version controller-v1.9.6"
+  artifacthub.io/changes: '- "Update Ingress-Nginx version controller-v1.10.0"'
  artifacthub.io/prerelease: "false"
 apiVersion: v2
 appVersion: latest
@@ -17,4 +15,4 @@ kubeVersion: '>=1.20.0-0'
 name: open-appsec-k8s-nginx-ingress
 sources:
 - https://github.com/kubernetes/ingress-nginx
-version: 4.9.1
+version: 4.10.0
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/README.md
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/README.md
@@ -2,7 +2,7 @@

 [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

-![Version: 4.9.1](https://img.shields.io/badge/Version-4.9.1-informational?style=flat-square) ![AppVersion: 1.9.6](https://img.shields.io/badge/AppVersion-1.9.6-informational?style=flat-square)
+![Version: 4.10.0](https://img.shields.io/badge/Version-4.10.0-informational?style=flat-square) ![AppVersion: 1.10.0](https://img.shields.io/badge/AppVersion-1.10.0-informational?style=flat-square)

 To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.

@@ -253,11 +253,11 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.admissionWebhooks.namespaceSelector | object | `{}` |  |
 | controller.admissionWebhooks.objectSelector | object | `{}` |  |
 | controller.admissionWebhooks.patch.enabled | bool | `true` |  |
-| controller.admissionWebhooks.patch.image.digest | string | `"sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084"` |  |
+| controller.admissionWebhooks.patch.image.digest | string | `"sha256:44d1d0e9f19c63f58b380c5fddaca7cf22c7cee564adeff365225a5df5ef3334"` |  |
 | controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` |  |
 | controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` |  |
 | controller.admissionWebhooks.patch.image.registry | string | `"registry.k8s.io"` |  |
-| controller.admissionWebhooks.patch.image.tag | string | `"v20231226-1a7112e06"` |  |
+| controller.admissionWebhooks.patch.image.tag | string | `"v1.4.0"` |  |
 | controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
 | controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
 | controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` |  |
@@ -317,7 +317,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.hostname | object | `{}` | Optionally customize the pod hostname. |
 | controller.image.allowPrivilegeEscalation | bool | `false` |  |
 | controller.image.chroot | bool | `false` |  |
-| controller.image.digest | string | `"sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c"` |  |
+| controller.image.digest | string | `"sha256:42b3f0e5d0846876b1791cd3afeb5f1cbbe4259d6f35651dcc1b5c980925379c"` |  |
 | controller.image.digestChroot | string | `"sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096"` |  |
 | controller.image.image | string | `"ingress-nginx/controller"` |  |
 | controller.image.pullPolicy | string | `"IfNotPresent"` |  |
@@ -326,7 +326,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.image.runAsNonRoot | bool | `true` |  |
 | controller.image.runAsUser | int | `101` |  |
 | controller.image.seccompProfile.type | string | `"RuntimeDefault"` |  |
-| controller.image.tag | string | `"v1.9.6"` |  |
+| controller.image.tag | string | `"v1.10.0"` |  |
 | controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
 | controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
 | controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/changelog/helm-chart-4.10.0.md
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/changelog/helm-chart-4.10.0.md
@@ -0,0 +1,9 @@
+# Changelog
+
+This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
+
+### 4.10.0
+
+* - "Update Ingress-Nginx version controller-v1.10.0"
+
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.9.1...helm-chart-4.10.0
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/templates/_params.tpl
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/templates/_params.tpl
@@ -29,7 +29,7 @@
 - --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }}
 {{- end }}
 {{- if and (not .Values.controller.scope.enabled) .Values.controller.scope.namespaceSelector }}
- --watch-namespace-selector={{ default "" .Values.controller.scope.namespaceSelector }}
+- --watch-namespace-selector={{ .Values.controller.scope.namespaceSelector }}
 {{- end }}
 {{- if and .Values.controller.reportNodeInternalIp .Values.controller.hostNetwork }}
 - --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }}
@@ -54,6 +54,9 @@
 {{- if .Values.controller.watchIngressWithoutClass }}
 - --watch-ingress-without-class=true
 {{- end }}
+{{- if not .Values.controller.metrics.enabled }}
+- --enable-metrics={{ .Values.controller.metrics.enabled }}
+{{- end }}
 {{- if .Values.controller.enableTopologyAwareRouting }}
 - --enable-topology-aware-routing=true
 {{- end }}
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/templates/controller-prometheusrules.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/templates/controller-prometheusrules.yaml
@@ -1,4 +1,4 @@
-{{- if and ( .Values.controller.metrics.enabled ) ( .Values.controller.metrics.prometheusRule.enabled ) ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) -}}
+{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.prometheusRule.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/templates/default-policy.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/templates/default-policy.yaml
@@ -34,7 +34,7 @@ spec:
    http-headers: false
    request-body: false
  log-destination:
-    cloud: false
+    cloud: true
    stdout:
      format: json-formatted
 ---
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml
@@ -21,7 +21,7 @@ tests:
          of: ConfigMap
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-custom-add-headers
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-custom-add-headers
      - equal:
          path: data.X-Another-Custom-Header
          value: Value
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml
@@ -21,7 +21,7 @@ tests:
          of: ConfigMap
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-custom-proxy-headers
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-custom-proxy-headers
      - equal:
          path: data.X-Custom-Header
          value: Value
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml
@@ -11,4 +11,4 @@ tests:
          of: ConfigMap
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml
@@ -6,6 +6,7 @@ tests:
  - it: should create a DaemonSet if `controller.kind` is "DaemonSet"
    set:
      controller.kind: DaemonSet
+      kind: Vanilla
    asserts:
      - hasDocuments:
          count: 1
@@ -13,4 +14,38 @@ tests:
          of: DaemonSet
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
+
+  - it: should create a DaemonSet with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
+    set:
+      controller.kind: DaemonSet
+      kind: Vanilla
+      controller.metrics.enabled: false
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --enable-metrics=false
+
+  - it: should create a DaemonSet without argument `--enable-metrics=false` if `controller.metrics.enabled` is true
+    set:
+      controller.kind: DaemonSet
+      kind: Vanilla
+      controller.metrics.enabled: true
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --enable-metrics=false
+
+  - it: should create a DaemonSet with resource limits if `controller.resources.limits` is set
+    set:
+      controller.kind: DaemonSet
+      kind: Vanilla
+      controller.resources.limits.cpu: 500m
+      controller.resources.limits.memory: 512Mi
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 500m
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 512Mi
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml
@@ -11,20 +11,38 @@ tests:
          of: Deployment
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

  - it: should create a Deployment with 3 replicas if `controller.replicaCount` is 3
    set:
      controller.replicaCount: 3
+      kind: Vanilla
    asserts:
      - equal:
          path: spec.replicas
          value: 3

+  - it: should create a Deployment with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
+    set:
+      controller.metrics.enabled: false
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --enable-metrics=false
+
+  - it: should create a Deployment without argument `--enable-metrics=false` if `controller.metrics.enabled` is true
+    set:
+      controller.metrics.enabled: true
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --enable-metrics=false
+
  - it: should create a Deployment with resource limits if `controller.resources.limits` is set
    set:
      controller.resources.limits.cpu: 500m
      controller.resources.limits.memory: 512Mi
+      kind: Vanilla
    asserts:
      - equal:
          path: spec.template.spec.containers[0].resources.limits.cpu
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml
@@ -14,4 +14,4 @@ tests:
          of: HorizontalPodAutoscaler
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml
@@ -14,4 +14,4 @@ tests:
          of: ScaledObject
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml
@@ -20,4 +20,4 @@ tests:
          of: NetworkPolicy
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml
@@ -22,4 +22,4 @@ tests:
          of: Service
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller-internal
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller-internal
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml
@@ -20,4 +20,4 @@ tests:
          of: Service
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller-metrics
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller-metrics
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml
@@ -20,7 +20,7 @@ tests:
          of: Service
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

  - it: should create a Service of type "NodePort" if `controller.service.external.enabled` is true and `controller.service.type` is "NodePort"
    set:
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml
@@ -20,7 +20,7 @@ tests:
          of: Service
      - equal:
          path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-defaultbackend
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-defaultbackend

  - it: should create a Service with port 80 if `defaultBackend.service.port` is 80
    set:
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/values.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/values.yaml
@@ -26,8 +26,8 @@ controller:
    ## for backwards compatibility consider setting the full image url via the repository value below
    ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
    ## repository:
-    tag: "v1.9.6"
-    digest: sha256:1405cc613bd95b2c6edd8b2a152510ae91c7e62aea4698500d23b2145960ab9c
+    tag: "v1.10.0"
+    digest: sha256:42b3f0e5d0846876b1791cd3afeb5f1cbbe4259d6f35651dcc1b5c980925379c
    digestChroot: sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096
    pullPolicy: IfNotPresent
    runAsNonRoot: true
@@ -781,8 +781,8 @@ controller:
        ## for backwards compatibility consider setting the full image url via the repository value below
        ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
        ## repository:
-        tag: v20231226-1a7112e06
-        digest: sha256:25d6a5f11211cc5c3f9f2bf552b585374af287b4debf693cacbe2da47daa5084
+        tag: v1.4.0
+        digest: sha256:44d1d0e9f19c63f58b380c5fddaca7cf22c7cee564adeff365225a5df5ef3334
        pullPolicy: IfNotPresent
      # -- Provide a priority class name to the webhook patching job
      ##
@@ -1198,7 +1198,7 @@ appsec:
    image:
      registry: ghcr.io/openappsec
      image: smartsync-tuning
-      tag: 1.1.3
+      tag: latest
    enabled: false
    replicaCount: 1
    securityContext:
--- a/build_system/charts/open-appsec-kong/CHANGELOG.md
+++ b/build_system/charts/open-appsec-kong/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog

+## 2.38.0
+
+### Changes
+
+* Added support for setting `SVC.tls.appProtocol` and `SVC.http.appProtocol` values to configure the appProtocol fields
+  for Kubernetes Service HTTP and TLS ports. It might be useful for integration with external load balancers like GCP.
+  [#1018](https://github.com/Kong/charts/pull/1018)
+
+## 2.37.1
+
+* Rename the controller status port. This fixes a collision with the proxy status port in the Prometheus ServiceMonitor.
+  [#1008](https://github.com/Kong/charts/pull/1008)
+
+## 2.37.0
+
+### Changes
+
+* Bumped default `kong/kubernetes-ingress-controller` image tag and updated CRDs to 3.1.
+  [#1011](https://github.com/Kong/charts/pull/1011)
+* Bumped default `kong` image tag to 3.6.
+  [#1011](https://github.com/Kong/charts/pull/1011)
+
 ## 2.36.0

 ### Fixed
--- a/build_system/charts/open-appsec-kong/Chart.yaml
+++ b/build_system/charts/open-appsec-kong/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.1.6
+appVersion: 1.1.8
 dependencies:
 - condition: postgresql.enabled
  name: postgresql
@@ -14,4 +14,4 @@ maintainers:
 name: open-appsec-kong
 sources:
 - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.36.0
+version: 2.38.0
--- a/build_system/charts/open-appsec-kong/README.md
+++ b/build_system/charts/open-appsec-kong/README.md
@@ -666,40 +666,42 @@ nodes.
 mixed TCP/UDP LoadBalancer Services). It _does not_ support the `http`, `tls`,
 or `ingress` sections, as it is used only for stream listens.

-| Parameter                          | Description                                                                           | Default                  |
-|------------------------------------|---------------------------------------------------------------------------------------|--------------------------|
-| SVC.enabled                        | Create Service resource for SVC (admin, proxy, manager, etc.)                         |                          |
-| SVC.http.enabled                   | Enables http on the service                                                           |                          |
-| SVC.http.servicePort               | Service port to use for http                                                          |                          |
-| SVC.http.containerPort             | Container port to use for http                                                        |                          |
-| SVC.http.nodePort                  | Node port to use for http                                                             |                          |
-| SVC.http.hostPort                  | Host port to use for http                                                             |                          |
-| SVC.http.parameters                | Array of additional listen parameters                                                 | `[]`                     |
-| SVC.tls.enabled                    | Enables TLS on the service                                                            |                          |
-| SVC.tls.containerPort              | Container port to use for TLS                                                         |                          |
-| SVC.tls.servicePort                | Service port to use for TLS                                                           |                          |
-| SVC.tls.nodePort                   | Node port to use for TLS                                                              |                          |
-| SVC.tls.hostPort                   | Host port to use for TLS                                                              |                          |
-| SVC.tls.overrideServiceTargetPort  | Override service port to use for TLS without touching Kong containerPort              |                          |
-| SVC.tls.parameters                 | Array of additional listen parameters                                                 | `["http2"]`              |
-| SVC.type                           | k8s service type. Options: NodePort, ClusterIP, LoadBalancer                          |                          |
-| SVC.clusterIP                      | k8s service clusterIP                                                                 |                          |
-| SVC.loadBalancerClass              | loadBalancerClass to use for LoadBalancer provisionning                               |                          |
-| SVC.loadBalancerSourceRanges       | Limit service access to CIDRs if set and service type is `LoadBalancer`               | `[]`                     |
-| SVC.loadBalancerIP                 | Reuse an existing ingress static IP for the service                                   |                          |
-| SVC.externalIPs                    | IPs for which nodes in the cluster will also accept traffic for the servic            | `[]`                     |
-| SVC.externalTrafficPolicy          | k8s service's externalTrafficPolicy. Options: Cluster, Local                          |                          |
-| SVC.ingress.enabled                | Enable ingress resource creation (works with SVC.type=ClusterIP)                      | `false`                  |
-| SVC.ingress.ingressClassName       | Set the ingressClassName to associate this Ingress with an IngressClass               |                          |
-| SVC.ingress.hostname               | Ingress hostname                                                                      | `""`                     |
-| SVC.ingress.path                   | Ingress path.                                                                         | `/`                      |
-| SVC.ingress.pathType               | Ingress pathType. One of `ImplementationSpecific`, `Exact` or `Prefix`                | `ImplementationSpecific` |
-| SVC.ingress.hosts                  | Slice of hosts configurations, including `hostname`, `path` and `pathType` keys       | `[]`                     |
-| SVC.ingress.tls                    | Name of secret resource or slice of `secretName` and `hosts` keys                     |                          |
-| SVC.ingress.annotations            | Ingress annotations. See documentation for your ingress controller for details        | `{}`                     |
-| SVC.ingress.labels                 | Ingress labels. Additional custom labels to add to the ingress.                       | `{}`                     |
-| SVC.annotations                    | Service annotations                                                                   | `{}`                     |
-| SVC.labels                         | Service labels                                                                        | `{}`                     |
+| Parameter                         | Description                                                                               | Default                  |
+|-----------------------------------|-------------------------------------------------------------------------------------------|--------------------------|
+| SVC.enabled                       | Create Service resource for SVC (admin, proxy, manager, etc.)                             |                          |
+| SVC.http.enabled                  | Enables http on the service                                                               |                          |
+| SVC.http.servicePort              | Service port to use for http                                                              |                          |
+| SVC.http.containerPort            | Container port to use for http                                                            |                          |
+| SVC.http.nodePort                 | Node port to use for http                                                                 |                          |
+| SVC.http.hostPort                 | Host port to use for http                                                                 |                          |
+| SVC.http.parameters               | Array of additional listen parameters                                                     | `[]`                     |
+| SVC.http.appProtocol              | `appProtocol` to be set in a Service's port. If left empty, no `appProtocol` will be set. |                          |
+| SVC.tls.enabled                   | Enables TLS on the service                                                                |                          |
+| SVC.tls.containerPort             | Container port to use for TLS                                                             |                          |
+| SVC.tls.servicePort               | Service port to use for TLS                                                               |                          |
+| SVC.tls.nodePort                  | Node port to use for TLS                                                                  |                          |
+| SVC.tls.hostPort                  | Host port to use for TLS                                                                  |                          |
+| SVC.tls.overrideServiceTargetPort | Override service port to use for TLS without touching Kong containerPort                  |                          |
+| SVC.tls.parameters                | Array of additional listen parameters                                                     | `["http2"]`              |
+| SVC.tls.appProtocol               | `appProtocol` to be set in a Service's port. If left empty, no `appProtocol` will be set. |                          |
+| SVC.type                          | k8s service type. Options: NodePort, ClusterIP, LoadBalancer                              |                          |
+| SVC.clusterIP                     | k8s service clusterIP                                                                     |                          |
+| SVC.loadBalancerClass             | loadBalancerClass to use for LoadBalancer provisionning                                   |                          |
+| SVC.loadBalancerSourceRanges      | Limit service access to CIDRs if set and service type is `LoadBalancer`                   | `[]`                     |
+| SVC.loadBalancerIP                | Reuse an existing ingress static IP for the service                                       |                          |
+| SVC.externalIPs                   | IPs for which nodes in the cluster will also accept traffic for the servic                | `[]`                     |
+| SVC.externalTrafficPolicy         | k8s service's externalTrafficPolicy. Options: Cluster, Local                              |                          |
+| SVC.ingress.enabled               | Enable ingress resource creation (works with SVC.type=ClusterIP)                          | `false`                  |
+| SVC.ingress.ingressClassName      | Set the ingressClassName to associate this Ingress with an IngressClass                   |                          |
+| SVC.ingress.hostname              | Ingress hostname                                                                          | `""`                     |
+| SVC.ingress.path                  | Ingress path.                                                                             | `/`                      |
+| SVC.ingress.pathType              | Ingress pathType. One of `ImplementationSpecific`, `Exact` or `Prefix`                    | `ImplementationSpecific` |
+| SVC.ingress.hosts                 | Slice of hosts configurations, including `hostname`, `path` and `pathType` keys           | `[]`                     |
+| SVC.ingress.tls                   | Name of secret resource or slice of `secretName` and `hosts` keys                         |                          |
+| SVC.ingress.annotations           | Ingress annotations. See documentation for your ingress controller for details            | `{}`                     |
+| SVC.ingress.labels                | Ingress labels. Additional custom labels to add to the ingress.                           | `{}`                     |
+| SVC.annotations                   | Service annotations                                                                       | `{}`                     |
+| SVC.labels                        | Service labels                                                                            | `{}`                     |

 #### Admin Service mTLS

--- a/build_system/charts/open-appsec-kong/ci/snapshots/admin-api-service-clusterip-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/admin-api-service-clusterip-values.snap
@@ -9,8 +9,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -33,9 +33,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -90,7 +90,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -205,7 +205,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -274,8 +274,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-custom-dbless-config
        namespace: default
 - object:
@@ -286,8 +286,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-admin
        namespace: default
    spec:
@@ -309,8 +309,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -336,9 +336,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -364,8 +364,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/custom-labels-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/custom-labels-values.snap
@@ -9,8 +9,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -84,8 +84,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -108,9 +108,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -138,7 +138,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -159,7 +159,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -240,7 +240,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -350,7 +350,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -408,8 +408,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -617,6 +617,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -657,8 +689,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -677,8 +709,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -742,8 +774,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -766,8 +798,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -783,8 +815,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -797,8 +829,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -825,9 +857,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -854,8 +886,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -870,8 +902,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -881,8 +913,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/default-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/default-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -137,7 +137,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -158,7 +158,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -241,7 +241,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -353,7 +353,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -410,8 +410,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -619,6 +619,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -658,8 +690,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -677,8 +709,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -741,8 +773,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -764,8 +796,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -780,8 +812,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -793,8 +825,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -820,9 +852,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -848,8 +880,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -863,8 +895,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -873,8 +905,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-1-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-1-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -135,7 +135,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -156,7 +156,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -237,7 +237,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -347,7 +347,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -404,8 +404,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -430,8 +430,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -639,6 +639,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -678,8 +710,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -697,8 +729,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -761,8 +793,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -784,8 +816,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -800,8 +832,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -822,8 +854,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -849,9 +881,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -877,8 +909,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -892,8 +924,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -902,8 +934,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-2-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-2-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -135,7 +135,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -156,7 +156,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -237,7 +237,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -347,7 +347,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -404,8 +404,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -432,8 +432,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -641,6 +641,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -680,8 +712,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -699,8 +731,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -763,8 +795,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -786,8 +818,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -802,8 +834,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -824,8 +856,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -851,9 +883,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -879,8 +911,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -894,8 +926,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -904,8 +936,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-3-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-3-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -135,7 +135,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -156,7 +156,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -237,7 +237,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -347,7 +347,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -404,8 +404,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -428,8 +428,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -637,6 +637,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -676,8 +708,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -695,8 +727,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -759,8 +791,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -782,8 +814,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -798,8 +830,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -811,8 +843,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -838,9 +870,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -866,8 +898,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -881,8 +913,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -891,8 +923,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-4-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-4-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -135,7 +135,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -156,7 +156,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -237,7 +237,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -347,7 +347,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -404,8 +404,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -463,8 +463,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -672,6 +672,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -711,8 +743,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -730,8 +762,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -794,8 +826,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -817,8 +849,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -833,8 +865,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -864,8 +896,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -891,9 +923,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -919,8 +951,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -934,8 +966,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -944,8 +976,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-5-3.1-rbac-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/kong-ingress-5-3.1-rbac-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -158,7 +158,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -241,7 +241,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -353,7 +353,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -410,8 +410,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -690,8 +690,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -709,8 +709,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -773,8 +773,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -796,8 +796,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -812,8 +812,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -825,8 +825,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -852,9 +852,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -880,8 +880,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -895,8 +895,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -905,8 +905,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/proxy-appprotocol-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/proxy-appprotocol-values.snap
@@ -0,0 +1,908 @@
+[proxy-appprotocol-values]
+SnapShot = """
+- object:
+    apiVersion: admissionregistration.k8s.io/v1
+    kind: ValidatingWebhookConfiguration
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong-validations
+        namespace: default
+    webhooks:
+        - admissionReviewVersions:
+            - v1beta1
+          clientConfig:
+            caBundle: '###DYNAMIC_FIELD###'
+            service:
+                name: chartsnap-kong-validation-webhook
+                namespace: default
+          failurePolicy: Ignore
+          name: validations.kong.konghq.com
+          objectSelector:
+            matchExpressions:
+                - key: owner
+                  operator: NotIn
+                  values:
+                    - helm
+          rules:
+            - apiGroups:
+                - configuration.konghq.com
+              apiVersions:
+                - '*'
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - kongconsumers
+                - kongplugins
+                - kongclusterplugins
+                - kongingresses
+            - apiGroups:
+                - \"\"
+              apiVersions:
+                - v1
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - secrets
+                - services
+            - apiGroups:
+                - networking.k8s.io
+              apiVersions:
+                - v1
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - ingresses
+            - apiGroups:
+                - gateway.networking.k8s.io
+              apiVersions:
+                - v1alpha2
+                - v1beta1
+                - v1
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - gateways
+                - httproutes
+          sideEffects: None
+- object:
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+        labels:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong
+        namespace: default
+    spec:
+        replicas: 1
+        selector:
+            matchLabels:
+                app.kubernetes.io/component: app
+                app.kubernetes.io/instance: chartsnap
+                app.kubernetes.io/name: kong
+        template:
+            metadata:
+                annotations:
+                    kuma.io/gateway: enabled
+                    kuma.io/service-account-token-volume: chartsnap-kong-token
+                    traffic.sidecar.istio.io/includeInboundPorts: \"\"
+                labels:
+                    app: chartsnap-kong
+                    app.kubernetes.io/component: app
+                    app.kubernetes.io/instance: chartsnap
+                    app.kubernetes.io/managed-by: Helm
+                    app.kubernetes.io/name: kong
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
+            spec:
+                automountServiceAccountToken: false
+                containers:
+                    - args: null
+                      env:
+                        - name: POD_NAME
+                          valueFrom:
+                            fieldRef:
+                                apiVersion: v1
+                                fieldPath: metadata.name
+                        - name: POD_NAMESPACE
+                          valueFrom:
+                            fieldRef:
+                                apiVersion: v1
+                                fieldPath: metadata.namespace
+                        - name: CONTROLLER_ADMISSION_WEBHOOK_LISTEN
+                          value: 0.0.0.0:8080
+                        - name: CONTROLLER_ELECTION_ID
+                          value: kong-ingress-controller-leader-kong
+                        - name: CONTROLLER_INGRESS_CLASS
+                          value: kong
+                        - name: CONTROLLER_KONG_ADMIN_TLS_SKIP_VERIFY
+                          value: \"true\"
+                        - name: CONTROLLER_KONG_ADMIN_URL
+                          value: https://localhost:8444
+                        - name: CONTROLLER_PUBLISH_SERVICE
+                          value: default/chartsnap-kong-proxy
+                      image: kong/kubernetes-ingress-controller:3.1
+                      imagePullPolicy: IfNotPresent
+                      livenessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /healthz
+                            port: 10254
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      name: ingress-controller
+                      ports:
+                        - containerPort: 8080
+                          name: webhook
+                          protocol: TCP
+                        - containerPort: 10255
+                          name: cmetrics
+                          protocol: TCP
+                        - containerPort: 10254
+                          name: cstatus
+                          protocol: TCP
+                      readinessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /readyz
+                            port: 10254
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      resources: {}
+                      securityContext:
+                        allowPrivilegeEscalation: false
+                        capabilities:
+                            drop:
+                                - ALL
+                        readOnlyRootFilesystem: true
+                        runAsNonRoot: true
+                        runAsUser: 1000
+                        seccompProfile:
+                            type: RuntimeDefault
+                      volumeMounts:
+                        - mountPath: /admission-webhook
+                          name: webhook-cert
+                          readOnly: true
+                        - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+                          name: chartsnap-kong-token
+                          readOnly: true
+                    - env:
+                        - name: KONG_ADMIN_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_GUI_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_GUI_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_LISTEN
+                          value: 127.0.0.1:8444 http2 ssl, [::1]:8444 http2 ssl
+                        - name: KONG_CLUSTER_LISTEN
+                          value: \"off\"
+                        - name: KONG_DATABASE
+                          value: \"off\"
+                        - name: KONG_KIC
+                          value: \"on\"
+                        - name: KONG_LUA_PACKAGE_PATH
+                          value: /opt/?.lua;/opt/?/init.lua;;
+                        - name: KONG_NGINX_WORKER_PROCESSES
+                          value: \"2\"
+                        - name: KONG_PORTAL_API_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PORTAL_API_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PORT_MAPS
+                          value: 80:8000, 443:8443
+                        - name: KONG_PREFIX
+                          value: /kong_prefix/
+                        - name: KONG_PROXY_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PROXY_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PROXY_LISTEN
+                          value: 0.0.0.0:8000, [::]:8000, 0.0.0.0:8443 http2 ssl, [::]:8443 http2 ssl
+                        - name: KONG_PROXY_STREAM_ACCESS_LOG
+                          value: /dev/stdout basic
+                        - name: KONG_PROXY_STREAM_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ROUTER_FLAVOR
+                          value: traditional
+                        - name: KONG_STATUS_ACCESS_LOG
+                          value: \"off\"
+                        - name: KONG_STATUS_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_STATUS_LISTEN
+                          value: 0.0.0.0:8100, [::]:8100
+                        - name: KONG_STREAM_LISTEN
+                          value: \"off\"
+                        - name: KONG_NGINX_DAEMON
+                          value: \"off\"
+                      image: kong:3.6
+                      imagePullPolicy: IfNotPresent
+                      lifecycle:
+                        preStop:
+                            exec:
+                                command:
+                                    - kong
+                                    - quit
+                                    - --wait=15
+                      livenessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /status
+                            port: status
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      name: proxy
+                      ports:
+                        - containerPort: 8000
+                          name: proxy
+                          protocol: TCP
+                        - containerPort: 8443
+                          name: proxy-tls
+                          protocol: TCP
+                        - containerPort: 8100
+                          name: status
+                          protocol: TCP
+                      readinessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /status/ready
+                            port: status
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      resources: {}
+                      securityContext:
+                        allowPrivilegeEscalation: false
+                        capabilities:
+                            drop:
+                                - ALL
+                        readOnlyRootFilesystem: true
+                        runAsNonRoot: true
+                        runAsUser: 1000
+                        seccompProfile:
+                            type: RuntimeDefault
+                      volumeMounts:
+                        - mountPath: /kong_prefix/
+                          name: chartsnap-kong-prefix-dir
+                        - mountPath: /tmp
+                          name: chartsnap-kong-tmp
+                initContainers:
+                    - command:
+                        - rm
+                        - -vrf
+                        - $KONG_PREFIX/pids
+                      env:
+                        - name: KONG_ADMIN_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_GUI_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_GUI_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_LISTEN
+                          value: 127.0.0.1:8444 http2 ssl, [::1]:8444 http2 ssl
+                        - name: KONG_CLUSTER_LISTEN
+                          value: \"off\"
+                        - name: KONG_DATABASE
+                          value: \"off\"
+                        - name: KONG_KIC
+                          value: \"on\"
+                        - name: KONG_LUA_PACKAGE_PATH
+                          value: /opt/?.lua;/opt/?/init.lua;;
+                        - name: KONG_NGINX_WORKER_PROCESSES
+                          value: \"2\"
+                        - name: KONG_PORTAL_API_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PORTAL_API_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PORT_MAPS
+                          value: 80:8000, 443:8443
+                        - name: KONG_PREFIX
+                          value: /kong_prefix/
+                        - name: KONG_PROXY_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PROXY_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PROXY_LISTEN
+                          value: 0.0.0.0:8000, [::]:8000, 0.0.0.0:8443 http2 ssl, [::]:8443 http2 ssl
+                        - name: KONG_PROXY_STREAM_ACCESS_LOG
+                          value: /dev/stdout basic
+                        - name: KONG_PROXY_STREAM_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ROUTER_FLAVOR
+                          value: traditional
+                        - name: KONG_STATUS_ACCESS_LOG
+                          value: \"off\"
+                        - name: KONG_STATUS_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_STATUS_LISTEN
+                          value: 0.0.0.0:8100, [::]:8100
+                        - name: KONG_STREAM_LISTEN
+                          value: \"off\"
+                      image: kong:3.6
+                      imagePullPolicy: IfNotPresent
+                      name: clear-stale-pid
+                      resources: {}
+                      securityContext:
+                        allowPrivilegeEscalation: false
+                        capabilities:
+                            drop:
+                                - ALL
+                        readOnlyRootFilesystem: true
+                        runAsNonRoot: true
+                        runAsUser: 1000
+                        seccompProfile:
+                            type: RuntimeDefault
+                      volumeMounts:
+                        - mountPath: /kong_prefix/
+                          name: chartsnap-kong-prefix-dir
+                        - mountPath: /tmp
+                          name: chartsnap-kong-tmp
+                securityContext: {}
+                serviceAccountName: chartsnap-kong
+                terminationGracePeriodSeconds: 30
+                volumes:
+                    - emptyDir:
+                        sizeLimit: 256Mi
+                      name: chartsnap-kong-prefix-dir
+                    - emptyDir:
+                        sizeLimit: 1Gi
+                      name: chartsnap-kong-tmp
+                    - name: chartsnap-kong-token
+                      projected:
+                        sources:
+                            - serviceAccountToken:
+                                expirationSeconds: 3607
+                                path: token
+                            - configMap:
+                                items:
+                                    - key: ca.crt
+                                      path: ca.crt
+                                name: kube-root-ca.crt
+                            - downwardAPI:
+                                items:
+                                    - fieldRef:
+                                        apiVersion: v1
+                                        fieldPath: metadata.namespace
+                                      path: namespace
+                    - name: webhook-cert
+                      secret:
+                        secretName: chartsnap-kong-validation-webhook-keypair
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: ClusterRole
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong
+    rules:
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongupstreampolicies
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongupstreampolicies/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumergroups
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumergroups/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - \"\"
+          resources:
+            - events
+          verbs:
+            - create
+            - patch
+        - apiGroups:
+            - \"\"
+          resources:
+            - nodes
+          verbs:
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - pods
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - secrets
+          verbs:
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - services
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - services/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - ingressclassparameterses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumers
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumers/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongplugins
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongplugins/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - tcpingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - tcpingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - udpingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - udpingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - extensions
+          resources:
+            - ingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - extensions
+          resources:
+            - ingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - networking.k8s.io
+          resources:
+            - ingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - networking.k8s.io
+          resources:
+            - ingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - discovery.k8s.io
+          resources:
+            - endpointslices
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongclusterplugins
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongclusterplugins/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - apiextensions.k8s.io
+          resources:
+            - customresourcedefinitions
+          verbs:
+            - list
+            - watch
+        - apiGroups:
+            - networking.k8s.io
+          resources:
+            - ingressclasses
+          verbs:
+            - get
+            - list
+            - watch
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: ClusterRoleBinding
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong
+    roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: ClusterRole
+        name: chartsnap-kong
+    subjects:
+        - kind: ServiceAccount
+          name: chartsnap-kong
+          namespace: default
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: Role
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong
+        namespace: default
+    rules:
+        - apiGroups:
+            - \"\"
+          resources:
+            - configmaps
+            - pods
+            - secrets
+            - namespaces
+          verbs:
+            - get
+        - apiGroups:
+            - \"\"
+          resourceNames:
+            - kong-ingress-controller-leader-kong-kong
+          resources:
+            - configmaps
+          verbs:
+            - get
+            - update
+        - apiGroups:
+            - \"\"
+          resources:
+            - configmaps
+          verbs:
+            - create
+        - apiGroups:
+            - \"\"
+            - coordination.k8s.io
+          resources:
+            - configmaps
+            - leases
+          verbs:
+            - get
+            - list
+            - watch
+            - create
+            - update
+            - patch
+            - delete
+        - apiGroups:
+            - \"\"
+          resources:
+            - events
+          verbs:
+            - create
+            - patch
+        - apiGroups:
+            - \"\"
+          resources:
+            - services
+          verbs:
+            - get
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: RoleBinding
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong
+        namespace: default
+    roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: Role
+        name: chartsnap-kong
+    subjects:
+        - kind: ServiceAccount
+          name: chartsnap-kong
+          namespace: default
+- object:
+    apiVersion: v1
+    data:
+        tls.crt: '###DYNAMIC_FIELD###'
+        tls.key: '###DYNAMIC_FIELD###'
+    kind: Secret
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong-validation-webhook-ca-keypair
+        namespace: default
+    type: kubernetes.io/tls
+- object:
+    apiVersion: v1
+    data:
+        tls.crt: '###DYNAMIC_FIELD###'
+        tls.key: '###DYNAMIC_FIELD###'
+    kind: Secret
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong-validation-webhook-keypair
+        namespace: default
+    type: kubernetes.io/tls
+- object:
+    apiVersion: v1
+    kind: Service
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong-manager
+        namespace: default
+    spec:
+        ports:
+            - name: kong-manager
+              port: 8002
+              protocol: TCP
+              targetPort: 8002
+            - name: kong-manager-tls
+              port: 8445
+              protocol: TCP
+              targetPort: 8445
+        selector:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/name: kong
+        type: NodePort
+- object:
+    apiVersion: v1
+    kind: Service
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            enable-metrics: \"true\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong-proxy
+        namespace: default
+    spec:
+        ports:
+            - appProtocol: http
+              name: kong-proxy
+              port: 80
+              protocol: TCP
+              targetPort: 8000
+            - appProtocol: https
+              name: kong-proxy-tls
+              port: 443
+              protocol: TCP
+              targetPort: 8443
+        selector:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/name: kong
+        type: LoadBalancer
+- object:
+    apiVersion: v1
+    kind: Service
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong-validation-webhook
+        namespace: default
+    spec:
+        ports:
+            - name: webhook
+              port: 443
+              protocol: TCP
+              targetPort: webhook
+        selector:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+- object:
+    apiVersion: v1
+    kind: ServiceAccount
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
+        name: chartsnap-kong
+        namespace: default
+"""
--- a/build_system/charts/open-appsec-kong/ci/snapshots/service-account.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/service-account.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -135,7 +135,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -156,7 +156,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -237,7 +237,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -347,7 +347,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -404,8 +404,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -613,6 +613,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -652,8 +684,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -671,8 +703,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -735,8 +767,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -758,8 +790,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -774,8 +806,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -787,8 +819,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -814,9 +846,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -842,8 +874,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -857,8 +889,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -867,8 +899,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: my-kong-sa
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/single-image-default-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/single-image-default-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -105,9 +105,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -158,7 +158,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -410,8 +410,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -619,6 +619,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -658,8 +690,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -677,8 +709,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -741,8 +773,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -764,8 +796,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -780,8 +812,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -793,8 +825,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -820,9 +852,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -848,8 +880,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -863,8 +895,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -873,8 +905,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/test-enterprise-version-3.4.0.0-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/test-enterprise-version-3.4.0.0-values.snap
@@ -9,8 +9,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -32,9 +32,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -249,8 +249,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -276,9 +276,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -304,8 +304,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/test1-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/test1-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -104,10 +104,10 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
                    environment: test
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -139,7 +139,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -160,7 +160,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -252,7 +252,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -370,7 +370,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -447,8 +447,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -473,8 +473,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -497,8 +497,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -706,6 +706,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -745,8 +777,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -764,8 +796,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -828,8 +860,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -851,8 +883,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -867,8 +899,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -880,8 +912,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -907,9 +939,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -935,8 +967,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -950,8 +982,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: ServiceAccount
@@ -960,8 +992,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/test2-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/test2-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -83,8 +83,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -111,9 +111,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -150,7 +150,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -171,7 +171,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -270,7 +270,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -404,7 +404,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -507,7 +507,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-db
                      resources: {}
@@ -724,8 +724,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-init-migrations
        namespace: default
    spec:
@@ -740,8 +740,8 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
                name: kong-init-migrations
            spec:
                automountServiceAccountToken: false
@@ -819,7 +819,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: kong-migrations
                      resources: {}
@@ -924,7 +924,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-postgres
                      resources: {}
@@ -977,8 +977,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-post-upgrade-migrations
        namespace: default
    spec:
@@ -993,8 +993,8 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
                name: kong-post-upgrade-migrations
            spec:
                automountServiceAccountToken: false
@@ -1072,7 +1072,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: kong-post-upgrade-migrations
                      resources: {}
@@ -1177,7 +1177,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-postgres
                      resources: {}
@@ -1232,8 +1232,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-pre-upgrade-migrations
        namespace: default
    spec:
@@ -1248,8 +1248,8 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
                name: kong-pre-upgrade-migrations
            spec:
                automountServiceAccountToken: false
@@ -1327,7 +1327,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: kong-upgrade-migrations
                      resources: {}
@@ -1432,7 +1432,7 @@ SnapShot = """
                      envFrom:
                        - configMapRef:
                            name: env-config
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-postgres
                      resources: {}
@@ -1481,8 +1481,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -1505,10 +1505,26 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -1548,8 +1564,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -1567,8 +1583,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -1631,8 +1647,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-default
        namespace: default
    rules:
@@ -1841,6 +1857,22 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
 - object:
    apiVersion: rbac.authorization.k8s.io/v1
    kind: RoleBinding
@@ -1849,8 +1881,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -1869,8 +1901,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-default
        namespace: default
    roleRef:
@@ -1895,8 +1927,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-bash-wait-for-postgres
        namespace: default
 - object:
@@ -1917,8 +1949,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -1933,8 +1965,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -1961,8 +1993,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -1988,9 +2020,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -2024,8 +2056,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -2039,8 +2071,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: Service
@@ -2099,8 +2131,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/test3-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/test3-values.snap
@@ -9,8 +9,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -33,9 +33,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -92,7 +92,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -208,7 +208,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -295,8 +295,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-custom-dbless-config
        namespace: default
 - object:
@@ -307,8 +307,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -334,9 +334,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -362,8 +362,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/test4-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/test4-values.snap
@@ -9,8 +9,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -33,9 +33,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -92,7 +92,7 @@ SnapShot = """
                          value: 0.0.0.0:9000, [::]:9000, 0.0.0.0:9001 ssl, [::]:9001 ssl
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -212,7 +212,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: 0.0.0.0:9000, [::]:9000, 0.0.0.0:9001 ssl, [::]:9001 ssl
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -271,8 +271,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -304,8 +304,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-custom-dbless-config
        namespace: default
 - object:
@@ -316,8 +316,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -343,9 +343,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -379,8 +379,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/snapshots/test5-values.snap
+++ b/build_system/charts/open-appsec-kong/ci/snapshots/test5-values.snap
@@ -8,8 +8,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validations
        namespace: default
    webhooks:
@@ -82,8 +82,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    spec:
@@ -110,9 +110,9 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
-                    version: \"3.5\"
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
+                    version: \"3.6\"
            spec:
                automountServiceAccountToken: false
                containers:
@@ -142,7 +142,7 @@ SnapShot = """
                          value: https://localhost:8444
                        - name: CONTROLLER_PUBLISH_SERVICE
                          value: default/chartsnap-kong-proxy
-                      image: kong/kubernetes-ingress-controller:3.0
+                      image: kong/kubernetes-ingress-controller:3.1
                      imagePullPolicy: IfNotPresent
                      livenessProbe:
                        failureThreshold: 3
@@ -163,7 +163,7 @@ SnapShot = """
                          name: cmetrics
                          protocol: TCP
                        - containerPort: 10254
-                          name: status
+                          name: cstatus
                          protocol: TCP
                      readinessProbe:
                        failureThreshold: 3
@@ -261,7 +261,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      lifecycle:
                        preStop:
@@ -388,7 +388,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: clear-stale-pid
                      resources: {}
@@ -477,7 +477,7 @@ SnapShot = """
                          value: 0.0.0.0:8100, [::]:8100
                        - name: KONG_STREAM_LISTEN
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-db
                      resources: {}
@@ -694,8 +694,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-init-migrations
        namespace: default
    spec:
@@ -710,8 +710,8 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
                name: kong-init-migrations
            spec:
                automountServiceAccountToken: false
@@ -788,7 +788,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: kong-migrations
                      resources: {}
@@ -879,7 +879,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-postgres
                      resources: {}
@@ -932,8 +932,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-post-upgrade-migrations
        namespace: default
    spec:
@@ -948,8 +948,8 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
                name: kong-post-upgrade-migrations
            spec:
                automountServiceAccountToken: false
@@ -1026,7 +1026,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: kong-post-upgrade-migrations
                      resources: {}
@@ -1117,7 +1117,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-postgres
                      resources: {}
@@ -1172,8 +1172,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-pre-upgrade-migrations
        namespace: default
    spec:
@@ -1188,8 +1188,8 @@ SnapShot = """
                    app.kubernetes.io/instance: chartsnap
                    app.kubernetes.io/managed-by: Helm
                    app.kubernetes.io/name: kong
-                    app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.36.0
+                    app.kubernetes.io/version: \"3.6\"
+                    helm.sh/chart: kong-2.38.0
                name: kong-pre-upgrade-migrations
            spec:
                automountServiceAccountToken: false
@@ -1266,7 +1266,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: kong-upgrade-migrations
                      resources: {}
@@ -1357,7 +1357,7 @@ SnapShot = """
                          value: \"off\"
                        - name: KONG_NGINX_DAEMON
                          value: \"off\"
-                      image: kong:3.5
+                      image: kong:3.6
                      imagePullPolicy: IfNotPresent
                      name: wait-for-postgres
                      resources: {}
@@ -1406,8 +1406,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -1430,8 +1430,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    rules:
        - apiGroups:
@@ -1639,6 +1639,38 @@ SnapShot = """
            - get
            - list
            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
        - apiGroups:
            - configuration.konghq.com
          resources:
@@ -1678,8 +1710,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
    roleRef:
        apiGroup: rbac.authorization.k8s.io
@@ -1697,8 +1729,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    rules:
@@ -1761,8 +1793,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
    roleRef:
@@ -1787,8 +1819,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-bash-wait-for-postgres
        namespace: default
 - object:
@@ -1802,8 +1834,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-ca-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -1818,8 +1850,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook-keypair
        namespace: default
    type: kubernetes.io/tls
@@ -1846,8 +1878,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-manager
        namespace: default
    spec:
@@ -1873,9 +1905,9 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
+            app.kubernetes.io/version: \"3.6\"
            enable-metrics: \"true\"
-            helm.sh/chart: kong-2.36.0
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-proxy
        namespace: default
    spec:
@@ -1901,8 +1933,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong-validation-webhook
        namespace: default
    spec:
@@ -1916,8 +1948,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
 - object:
    apiVersion: v1
    kind: Service
@@ -1976,8 +2008,8 @@ SnapShot = """
            app.kubernetes.io/instance: chartsnap
            app.kubernetes.io/managed-by: Helm
            app.kubernetes.io/name: kong
-            app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.36.0
+            app.kubernetes.io/version: \"3.6\"
+            helm.sh/chart: kong-2.38.0
        name: chartsnap-kong
        namespace: default
 """
--- a/build_system/charts/open-appsec-kong/ci/proxy-appprotocol-values.yaml
+++ b/build_system/charts/open-appsec-kong/ci/proxy-appprotocol-values.yaml
@@ -0,0 +1,7 @@
+# This values test that the `proxy.*.appProtocol` can be set to a custom value.
+
+proxy:
+  http:
+    appProtocol: "http"
+  tls:
+    appProtocol: "https"
--- a/build_system/charts/open-appsec-kong/crds/custom-resource-definitions.yaml
+++ b/build_system/charts/open-appsec-kong/crds/custom-resource-definitions.yaml
--- a/build_system/charts/open-appsec-kong/templates/_helpers.tpl
+++ b/build_system/charts/open-appsec-kong/templates/_helpers.tpl
@@ -213,6 +213,9 @@ spec:
  - name: kong-{{ .serviceName }}
    port: {{ .http.servicePort }}
    targetPort: {{ .http.containerPort }}
+  {{- if .http.appProtocol }}
+    appProtocol: {{ .http.appProtocol }}
+  {{- end }}
  {{- if (and (or (eq .type "LoadBalancer") (eq .type "NodePort")) (not (empty .http.nodePort))) }}
    nodePort: {{ .http.nodePort }}
  {{- end }}
@@ -223,6 +226,9 @@ spec:
  - name: kong-{{ .serviceName }}-tls
    port: {{ .tls.servicePort }}
    targetPort: {{ .tls.overrideServiceTargetPort | default .tls.containerPort }}
+  {{- if .tls.appProtocol }}
+    appProtocol: {{ .tls.appProtocol }}
+  {{- end }}
  {{- if (and (or (eq .type "LoadBalancer") (eq .type "NodePort")) (not (empty .tls.nodePort))) }}
    nodePort: {{ .tls.nodePort }}
  {{- end }}
@@ -890,7 +896,7 @@ The name of the Service which will be used by the controller to update the Ingre
    containerPort: 10255
    protocol: TCP
  {{- end }}
-  - name: status
+  - name: cstatus
    containerPort: 10254
    protocol: TCP
  env:
--- a/build_system/charts/open-appsec-kong/templates/default-policy.yaml
+++ b/build_system/charts/open-appsec-kong/templates/default-policy.yaml
@@ -34,7 +34,7 @@ spec:
    http-headers: false
    request-body: false
  log-destination:
-    cloud: false
+    cloud: true
    stdout:
      format: json-formatted
 ---
--- a/build_system/charts/open-appsec-kong/values.yaml
+++ b/build_system/charts/open-appsec-kong/values.yaml
@@ -130,7 +130,7 @@ extraLabels: {}
 # Specify Kong's Docker image and repository details here
 image:
  repository: kong
-  tag: "3.5"
+  tag: "3.6"
  # Kong Enterprise
  # repository: kong/kong-gateway
  # tag: "3.5"
@@ -317,6 +317,10 @@ proxy:
    parameters:
    - http2

+    # Specify the Service's TLS port's appProtocol. This can be useful when integrating with
+    # external load balancers that require the `appProtocol` field to be set (e.g. GCP).
+    appProtocol: ""
+
  # Define stream (TCP) listen
  # To enable, remove "[]", uncomment the section below, and select your desired
  # ports and parameters. Listens are dynamically named after their containerPort,
@@ -525,7 +529,7 @@ ingressController:
  enabled: true
  image:
    repository: kong/kubernetes-ingress-controller
-    tag: "3.0"
+    tag: "3.1"
    # Optionally set a semantic version for version-gated features. This can normally
    # be left unset. You only need to set this if your tag is not a semver string,
    # such as when you are using a "next" tag. Set this to the effective semantic
@@ -1255,7 +1259,7 @@ appsec:
    #registry:
    repository: ghcr.io/openappsec
    image: "agent"
-    tag: "1.1.6"
+    tag: "1.1.8"
    pullPolicy: Always

    securityContext:
@@ -1269,7 +1273,7 @@ appsec:
  kong:
    image:
      repository: "ghcr.io/openappsec/kong-attachment"
-      tag: "1.1.6"
+      tag: "1.1.8"
  configMapName: appsec-settings-configmap
  configMapContent:
    crowdsec:
--- a/build_system/docker/entry.sh
+++ b/build_system/docker/entry.sh
@@ -11,6 +11,7 @@ var_fog_address=
 var_proxy=
 var_mode=
 var_token=
+var_ignore=
 init=

 if [ ! -f /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT ]; then
@@ -18,6 +19,10 @@ if [ ! -f /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT ]; then
    exit 1
 fi

+if [ -z $1 ]; then
+    var_mode="--hybrid_mode"
+fi
+
 while true; do
    if [ -z "$1" ]; then
        break
@@ -27,24 +32,27 @@ while true; do
    elif [ "$1" == "--proxy" ]; then
        shift
        var_proxy="$1"
-    elif [ "$1" == "--hybrid-mode" ]; then
+    elif [ "$1" == "--hybrid-mode" ] || [ "$1" == "--standalone" ]; then
        var_mode="--hybrid_mode"
+    elif [ "$1" == "--no-upgrade" ]; then
+        var_ignore="--ignore all"
    elif [ "$1" == "--token" ]; then
        shift
        var_token="$1"
-    elif [ "$1" == "--standalone" ]; then
-        var_mode="--hybrid_mode"
-        var_token="cp-3fb5c718-5e39-47e6-8d5e-99b4bc5660b74b4b7fc8-5312-451d-a763-aaf7872703c0"
    fi
    shift
 done

-if [ -z $var_token ]; then
+if [ -z $var_token ] && [ $var_mode != "--hybrid_mode" ]; then
    echo "Error: Token was not provided as input argument."
    exit 1
 fi

-orchestration_service_installation_flags="--token $var_token --container_mode --skip_registration"
+orchestration_service_installation_flags="--container_mode --skip_registration"
+if [ ! -z $var_token ]; then
+    export AGENT_TOKEN="$var_token"
+    orchestration_service_installation_flags="$orchestration_service_installation_flags --token $var_token"
+fi
 if [ ! -z $var_fog_address ]; then
    orchestration_service_installation_flags="$orchestration_service_installation_flags --fog $var_fog_address"
 fi
@@ -55,6 +63,9 @@ fi
 if [ ! -z $var_mode ]; then
    orchestration_service_installation_flags="$orchestration_service_installation_flags $var_mode"
 fi
+if [ ! -z "$var_ignore" ]; then
+    orchestration_service_installation_flags="$orchestration_service_installation_flags $var_ignore"
+fi


 /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT --install $orchestration_service_installation_flags
@@ -67,7 +78,7 @@ fi
 /nano-service-installers/$CACHE_INSTALLATION_SCRIPT --install
 /nano-service-installers/$HTTP_TRANSACTION_HANDLER_SERVICE --install

-if [ ! -z $CROWDSEC_ENABLED ]; then
+if [ "$CROWDSEC_ENABLED" == "true" ]; then
    /nano-service-installers/$INTELLIGENCE_INSTALLATION_SCRIPT --install
    /nano-service-installers/$CROWDSEC_INSTALLATION_SCRIPT --install
 fi
--- a/build_system/docker/install-cp-agent-intelligence-service.sh
+++ b/build_system/docker/install-cp-agent-intelligence-service.sh
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -1,11 +1,9 @@
 add_subdirectory(report_messaging)
 add_subdirectory(http_manager)
-add_subdirectory(generic_rulebase)
 add_subdirectory(signal_handler)
 add_subdirectory(gradual_deployment)
 add_subdirectory(packet)
 add_subdirectory(pending_key)
-add_subdirectory(health_check_manager)

 add_subdirectory(utils)
 add_subdirectory(attachment-intakers)
--- a/components/attachment-intakers/nginx_attachment/nginx_attachment.cc
+++ b/components/attachment-intakers/nginx_attachment/nginx_attachment.cc
@@ -1136,8 +1136,7 @@ private:
            NginxAttachmentOpaque &opaque = i_transaction_table->getState<NginxAttachmentOpaque>();
            uuid = opaque.getSessionUUID();
        }
-        web_response_data.uuid_size =
-            string("Incident Id: ").length() + uuid.size();
+        web_response_data.uuid_size = uuid.size();

        if (web_trigger_conf.getDetailsLevel() == "Redirect") {
            web_response_data.response_data.redirect_data.redirect_location_size =
@@ -1699,7 +1698,7 @@ private:
                }
            };
        mainloop->addFileRoutine(
-            I_MainLoop::RoutineType::RealTime,
+            I_MainLoop::RoutineType::System,
            server_sock,
            accept_attachment_routine,
            "Nginx Attachment registration listener",
--- a/components/attachment-intakers/nginx_attachment/nginx_attachment_config.cc
+++ b/components/attachment-intakers/nginx_attachment/nginx_attachment_config.cc
@@ -42,6 +42,7 @@ HttpAttachmentConfig::init()
    setNumOfNginxIpcElements();
    setDebugByContextValues();
    setKeepAliveIntervalMsec();
+    setRetriesForVerdict();
 }

 bool
@@ -215,6 +216,31 @@ HttpAttachmentConfig::setFailOpenTimeout()
    conf_data.setNumericalValue("nginx_inspection_mode", inspection_mode);
 }

+void
+HttpAttachmentConfig::setRetriesForVerdict()
+{
+    conf_data.setNumericalValue("min_retries_for_verdict", getAttachmentConf<uint>(
+        3,
+        "agent.minRetriesForVerdict.nginxModule",
+        "HTTP manager",
+        "Min retries for verdict"
+    ));
+
+    conf_data.setNumericalValue("max_retries_for_verdict", getAttachmentConf<uint>(
+        15,
+        "agent.maxRetriesForVerdict.nginxModule",
+        "HTTP manager",
+        "Max retries for verdict"
+    ));
+
+    conf_data.setNumericalValue("body_size_trigger", getAttachmentConf<uint>(
+        200000,
+        "agent.reqBodySizeTrigger.nginxModule",
+        "HTTP manager",
+        "Request body size trigger"
+    ));
+}
+
 void
 HttpAttachmentConfig::setFailOpenWaitMode()
 {
--- a/components/attachment-intakers/nginx_attachment/nginx_attachment_config.h
+++ b/components/attachment-intakers/nginx_attachment/nginx_attachment_config.h
@@ -70,6 +70,8 @@ private:

    void setDebugByContextValues();

+    void setRetriesForVerdict();
+
    WebTriggerConf web_trigger_conf;
    HttpAttachmentConfiguration conf_data;
 };
--- a/components/attachment-intakers/nginx_attachment/user_identifiers_config.cc
+++ b/components/attachment-intakers/nginx_attachment/user_identifiers_config.cc
@@ -306,17 +306,20 @@ UsersAllIdentifiersConfig::parseXForwardedFor(const string &str) const
 void
 UsersAllIdentifiersConfig::setXFFValuesToOpaqueCtx(const HttpHeader &header, ExtractType type) const
 {
+    auto i_transaction_table = Singleton::Consume<I_TableSpecific<SessionID>>::by<NginxAttachment>();
+    if (!i_transaction_table || !i_transaction_table->hasState<NginxAttachmentOpaque>()) {
+        dbgTrace(D_NGINX_ATTACHMENT_PARSER) << "Can't get the transaction table";
+        return;
+    }
+    NginxAttachmentOpaque &opaque = i_transaction_table->getState<NginxAttachmentOpaque>();
+    opaque.setSavedData(HttpTransactionData::xff_vals_ctx, header.getValue());
+    dbgTrace(D_NGINX_ATTACHMENT_PARSER) << "xff found, value from header: " << static_cast<string>(header.getValue());
    auto value = parseXForwardedFor(header.getValue());
    if (!value.ok()) {
        dbgTrace(D_NGINX_ATTACHMENT_PARSER) << "Could not extract source identifier from X-Forwarded-For header";
        return;
    };
-    auto i_transaction_table = Singleton::Consume<I_TableSpecific<SessionID>>::by<NginxAttachment>();
-    if (!i_transaction_table || !i_transaction_table->hasState<NginxAttachmentOpaque>()) {
-        dbgDebug(D_NGINX_ATTACHMENT_PARSER) << "Can't get the transaction table";
-        return;
-    }
-    NginxAttachmentOpaque &opaque = i_transaction_table->getState<NginxAttachmentOpaque>();
+
    if (type == ExtractType::SOURCEIDENTIFIER) {
        opaque.setSourceIdentifier(header.getKey(), value.unpack());
        dbgDebug(D_NGINX_ATTACHMENT_PARSER)
--- a/components/health_check_manager/health_check_manager_ut/CMakeLists.txt
+++ b/components/health_check_manager/health_check_manager_ut/CMakeLists.txt
@@ -1,8 +0,0 @@
-include_directories(${CMAKE_SOURCE_DIR}/components/include)
-link_directories(${BOOST_ROOT}/lib)
-
-add_unit_test(
-    health_check_manager_ut
-    "health_check_manager_ut.cc"
-    "singleton;messaging;mainloop;health_check_manager;event_is;metric;-lboost_regex"
-)
--- a/components/include/details_resolver.h
+++ b/components/include/details_resolver.h
@@ -34,6 +34,7 @@ public:
    ~DetailsResolver();

    void preload() override;
+    void init() override;

 private:
    class Impl;
--- a/components/include/downloader.h
+++ b/components/include/downloader.h
@@ -21,6 +21,7 @@
 #include "url_parser.h"
 #include "i_agent_details.h"
 #include "i_mainloop.h"
+#include "i_environment.h"
 #include "singleton.h"
 #include "component.h"

@@ -32,6 +33,7 @@ class Downloader
    Singleton::Consume<I_Encryptor>,
    Singleton::Consume<I_MainLoop>,
    Singleton::Consume<I_OrchestrationTools>,
+    Singleton::Consume<I_Environment>,
    Singleton::Consume<I_UpdateCommunication>
 {
 public:
--- a/components/include/external_sdk_server.h
+++ b/components/include/external_sdk_server.h
@@ -24,7 +24,8 @@ class ExternalSdkServer
        :
    public Component,
    Singleton::Provide<I_ExternalSdkServer>,
-    Singleton::Consume<I_RestApi>
+    Singleton::Consume<I_RestApi>,
+    Singleton::Consume<I_Messaging>
 {
 public:
    ExternalSdkServer();
--- a/components/include/generic_rulebase/match_query.h
+++ b/components/include/generic_rulebase/match_query.h
@@ -89,7 +89,9 @@ private:
    bool matchAttributesRegEx(const std::set<std::string> &values,
            std::set<std::string> &matched_override_keywords) const;
    bool matchAttributesString(const std::set<std::string> &values) const;
+    bool matchAttributesIp(const std::set<std::string> &values) const;
    bool isRegEx() const;
+    bool isIP() const;

    MatchType type;
    Operators operator_type;
--- a/components/include/http_geo_filter.h
+++ b/components/include/http_geo_filter.h
@@ -15,7 +15,8 @@ class HttpGeoFilter
    public Component,
    Singleton::Consume<I_MainLoop>,
    Singleton::Consume<I_GeoLocation>,
-    Singleton::Consume<I_GenericRulebase>
+    Singleton::Consume<I_GenericRulebase>,
+    Singleton::Consume<I_Environment>
 {
 public:
    HttpGeoFilter();
--- a/components/include/http_transaction_data.h
+++ b/components/include/http_transaction_data.h
@@ -136,6 +136,7 @@ public:
    static const std::string req_body;
    static const std::string source_identifier;
    static const std::string proxy_ip_ctx;
+    static const std::string xff_vals_ctx;

    static const CompressionType default_response_content_encoding;

--- a/components/include/i_details_resolver.h
+++ b/components/include/i_details_resolver.h
@@ -29,7 +29,9 @@ public:
    virtual bool isGwNotVsx() = 0;
    virtual bool isVersionAboveR8110() = 0;
    virtual bool isReverseProxy() = 0;
+    virtual bool isCloudStorageEnabled() = 0;
    virtual Maybe<std::tuple<std::string, std::string, std::string>> parseNginxMetadata() = 0;
+    virtual Maybe<std::tuple<std::string, std::string, std::string, std::string, std::string>> readCloudMetadata() = 0;
    virtual std::map<std::string, std::string> getResolvedDetails() = 0;
 #if defined(gaia) || defined(smb)
    virtual bool compareCheckpointVersion(int cp_version, std::function<bool(int, int)> compare_operator) const = 0;
--- a/components/include/i_downloader.h
+++ b/components/include/i_downloader.h
@@ -22,7 +22,7 @@
 class I_Downloader
 {
 public:
-    virtual Maybe<std::string> downloadFileFromFog(
+    virtual Maybe<std::string> downloadFile(
        const std::string &checksum,
        Package::ChecksumTypes,
        const GetResourceFile &resourse_file
--- a/components/include/i_generic_rulebase.h
+++ b/components/include/i_generic_rulebase.h
@@ -17,6 +17,7 @@
 #include <vector>

 #include "generic_rulebase/parameters_config.h"
+#include "generic_rulebase/triggers_config.h"
 #include "generic_rulebase/zone.h"
 #include "config.h"

@@ -26,6 +27,9 @@ public:
    virtual Maybe<Zone, Config::Errors> getLocalZone() const = 0;
    virtual Maybe<Zone, Config::Errors> getOtherZone() const = 0;

+    virtual LogTriggerConf getLogTriggerConf(const std::string &trigger_Id) const = 0;
+    virtual ParameterException getParameterException(const std::string &parameter_Id) const = 0;
+
    using ParameterKeyValues = std::unordered_map<std::string, std::set<std::string>>;
    virtual std::set<ParameterBehavior> getBehavior(const ParameterKeyValues &key_value_pairs) const = 0;

--- a/components/include/i_orchestration_tools.h
+++ b/components/include/i_orchestration_tools.h
@@ -117,7 +117,7 @@ public:
        const std::string &conf_path) const = 0;
    virtual bool copyFile(const std::string &src_path, const std::string &dst_path) const = 0;
    virtual bool doesFileExist(const std::string &file_path) const = 0;
-    virtual void getClusterId() const = 0;
+    virtual void setClusterId() const = 0;
    virtual void fillKeyInJson(
        const std::string &filename,
        const std::string &_key,
--- a/components/include/i_service_controller.h
+++ b/components/include/i_service_controller.h
@@ -64,7 +64,7 @@ public:
        const std::string &service_id
    ) = 0;

-    virtual std::map<std::string, PortNumber> getServiceToPortMap() = 0;
+    virtual std::map<std::string, std::vector<PortNumber>> getServiceToPortMap() = 0;

 protected:
    virtual ~I_ServiceController() {}
--- a/components/include/i_update_communication.h
+++ b/components/include/i_update_communication.h
@@ -32,6 +32,7 @@ public:
        const std::string &policy_versions
    ) const = 0;
    virtual Maybe<void> authenticateAgent() = 0;
+    virtual void registerLocalAgentToFog() = 0;
    virtual Maybe<void> getUpdate(CheckUpdateRequest &request) = 0;
    virtual Maybe<std::string> downloadAttributeFile(
        const GetResourceFile &resourse_file,
--- a/components/include/i_waap_telemetry.h
+++ b/components/include/i_waap_telemetry.h
@@ -25,6 +25,7 @@ struct DecisionTelemetryData
    std::string source;
    TrafficMethod method;
    int responseCode;
+    uint64_t elapsedTime;
    std::set<std::string> attackTypes;

    DecisionTelemetryData() :
@@ -36,6 +37,7 @@ struct DecisionTelemetryData
        source(),
        method(POST),
        responseCode(0),
+        elapsedTime(0),
        attackTypes()
    {
    }
--- a/components/include/orchestration_comp.h
+++ b/components/include/orchestration_comp.h
@@ -31,6 +31,7 @@
 #include "i_environment.h"
 #include "i_tenant_manager.h"
 #include "i_package_handler.h"
+#include "i_proxy_configuration.h"
 #include "i_env_details.h"
 #include "component.h"

@@ -54,7 +55,8 @@ class OrchestrationComp
    Singleton::Consume<I_UpdateCommunication>,
    Singleton::Consume<I_Downloader>,
    Singleton::Consume<I_ManifestController>,
-    Singleton::Consume<I_EnvDetails>
+    Singleton::Consume<I_EnvDetails>,
+    Singleton::Consume<I_ProxyConfiguration>
 {
 public:
    OrchestrationComp();
--- a/components/include/orchestration_status.h
+++ b/components/include/orchestration_status.h
@@ -40,7 +40,7 @@ public:
    ~OrchestrationStatus();

    void init() override;
-    
+
 private:
    class Impl;
    std::unique_ptr<Impl> pimpl;
--- a/components/include/package_handler.h
+++ b/components/include/package_handler.h
@@ -17,6 +17,7 @@
 #include "i_package_handler.h"
 #include "i_orchestration_tools.h"
 #include "i_shell_cmd.h"
+#include "i_environment.h"
 #include "component.h"

 class PackageHandler
@@ -24,7 +25,8 @@ class PackageHandler
    public Component,
    Singleton::Provide<I_PackageHandler>,
    Singleton::Consume<I_ShellCmd>,
-    Singleton::Consume<I_OrchestrationTools>
+    Singleton::Consume<I_OrchestrationTools>,
+    Singleton::Consume<I_Environment>
 {
 public:
    PackageHandler();
--- a/components/include/report_messaging.h
+++ b/components/include/report_messaging.h
@@ -36,7 +36,6 @@ public:
            title,
            audience_team,
            obj,
-            false,
            MessageCategory::GENERIC,
            std::forward<Args>(args)...
        )
@@ -48,26 +47,6 @@ public:
        const std::string &title,
        const ReportIS::AudienceTeam &audience_team,
        const T &obj,
-        bool is_async_message,
-        Args ...args)
-            :
-        ReportMessaging(
-            title,
-            audience_team,
-            obj,
-            is_async_message,
-            MessageCategory::GENERIC,
-            std::forward<Args>(args)...
-        )
-    {
-    }
-
-    template <typename ...Args, typename T>
-    ReportMessaging(
-        const std::string &title,
-        const ReportIS::AudienceTeam &audience_team,
-        const T &obj,
-        bool is_async_message,
        const MessageCategory &message_type,
        Args ...args)
            :
@@ -77,7 +56,6 @@ public:
            ReportIS::Severity::INFO,
            ReportIS::Priority::LOW,
            obj,
-            is_async_message,
            message_type,
            std::forward<Args>(args)...
        )
@@ -99,7 +77,6 @@ public:
            severity,
            priority,
            obj,
-            false,
            MessageCategory::GENERIC,
            std::forward<Args>(args)...
        )
@@ -114,7 +91,6 @@ public:
        const ReportIS::Severity &severity,
        const ReportIS::Priority &priority,
        const T &obj,
-        bool _is_async_message,
        const MessageCategory &message_type,
        Args ...args)
            :
@@ -131,7 +107,6 @@ public:
            std::chrono::seconds(0),
            std::forward<Args>(args)...
        ),
-        is_async_message(_is_async_message),
        message_type_tag(message_type)
    {
        report << LogField("eventObject", obj);
@@ -141,9 +116,14 @@ public:

    ReportMessaging & operator<<(const LogField &field);

+    Maybe<void, HTTPResponse> sendReportSynchronously();
+
+    void setForceBuffering(bool _force_buffering);
+
 private:
    Report report;
-    bool is_async_message;
+    bool is_async_message = true;
+    bool force_buffering = false;
    MessageCategory message_type_tag;
 };

--- a/components/include/telemetry.h
+++ b/components/include/telemetry.h
@@ -91,6 +91,7 @@ private:
    MetricCalculations::Counter response_2xx{this, "reservedNgenG"};
    MetricCalculations::Counter response_4xx{this, "reservedNgenH"};
    MetricCalculations::Counter response_5xx{this, "reservedNgenI"};
+    MetricCalculations::Average<uint64_t> average_latency{this, "reservedNgenJ"};
 };

 class WaapAttackTypesMetrics : public WaapTelemetryBase
--- a/components/include/url_parser.h
+++ b/components/include/url_parser.h
@@ -35,8 +35,10 @@ public:
    bool isOverSSL() const { return over_ssl; }
    std::string getPort() const { return port; }
    std::string getQuery() const { return query; }
+    std::string getHost() const;
    URLProtocol getProtocol() const { return protocol; }
    std::string toString() const;
+    void setHost(const std::string &new_host);
    void setQuery(const std::string &new_query);

 private:
@@ -47,6 +49,7 @@ private:
    std::string base_url;
    std::string port;
    std::string query;
+    std::string host;
    URLProtocol protocol;
 };

--- a/components/report_messaging/report_messaging.cc
+++ b/components/report_messaging/report_messaging.cc
@@ -24,6 +24,7 @@ static const string url = "/api/v1/agents/events";
 ReportMessaging::~ReportMessaging()
 {
    if (!Singleton::exists<I_Messaging>()) return;
+    if (!is_async_message) return;

    LogRest log_rest(report);

@@ -33,7 +34,9 @@ ReportMessaging::~ReportMessaging()
            HTTPMethod::POST,
            url,
            log_rest,
-            message_type_tag
+            message_type_tag,
+            MessageMetadata(),
+            force_buffering
        );
    } catch (...) {}
 }
@@ -44,3 +47,28 @@ ReportMessaging::operator<<(const LogField &field)
    report << field;
    return *this;
 }
+
+class LogRestWithReply : public LogRest
+{
+public:
+    LogRestWithReply(const Report &report) : LogRest(report) {}
+
+    bool loadJson(const string &) const { return true; }
+};
+
+Maybe<void, HTTPResponse>
+ReportMessaging::sendReportSynchronously()
+{
+    is_async_message = false;
+
+    LogRestWithReply log_rest(report);
+
+    auto messaging = Singleton::Consume<I_Messaging>::by<ReportMessaging>();
+    return messaging->sendSyncMessage(HTTPMethod::POST, url, log_rest, message_type_tag);
+}
+
+void
+ReportMessaging::setForceBuffering(bool _force_buffering)
+{
+    force_buffering = _force_buffering;
+}
--- a/components/report_messaging/report_messaging_ut/report_messaging_ut.cc
+++ b/components/report_messaging/report_messaging_ut/report_messaging_ut.cc
@@ -99,10 +99,94 @@ TEST_F(ReportMessagingTest, title_only)
            "    }\n"
            "}",
            _,
+            _,
            _
        )
    ).Times(1);
-    ReportMessaging("test", ReportIS::AudienceTeam::AGENT_CORE, 1, true, ReportIS::Tags::ACCESS_CONTROL);
+    ReportMessaging("test", ReportIS::AudienceTeam::AGENT_CORE, 1, ReportIS::Tags::ACCESS_CONTROL);
+}
+
+TEST_F(ReportMessagingTest, sync_sending)
+{
+    EXPECT_CALL(
+        mock_messaging,
+        sendSyncMessage(
+            _,
+            _,
+            "{\n"
+            "    \"log\": {\n"
+            "        \"eventTime\": \"Best Time ever\",\n"
+            "        \"eventName\": \"test\",\n"
+            "        \"eventSeverity\": \"Info\",\n"
+            "        \"eventPriority\": \"Low\",\n"
+            "        \"eventType\": \"Event Driven\",\n"
+            "        \"eventLevel\": \"Log\",\n"
+            "        \"eventLogLevel\": \"info\",\n"
+            "        \"eventAudience\": \"Internal\",\n"
+            "        \"eventAudienceTeam\": \"Agent Core\",\n"
+            "        \"eventFrequency\": 0,\n"
+            "        \"eventTags\": [\n"
+            "            \"Access Control\"\n"
+            "        ],\n"
+            "        \"eventSource\": {\n"
+            "            \"eventTraceId\": \"\",\n"
+            "            \"eventSpanId\": \"\",\n"
+            "            \"issuingEngineVersion\": \"\",\n"
+            "            \"serviceName\": \"Unnamed Nano Service\"\n"
+            "        },\n"
+            "        \"eventData\": {\n"
+            "            \"eventObject\": 1\n"
+            "        }\n"
+            "    }\n"
+            "}",
+            _,
+            _
+        )
+    ).WillOnce(Return(HTTPResponse(HTTPStatusCode::HTTP_OK, "response!!")));
+    ReportMessaging report("test", ReportIS::AudienceTeam::AGENT_CORE, 1, ReportIS::Tags::ACCESS_CONTROL);
+    EXPECT_TRUE(report.sendReportSynchronously().ok());
+}
+
+TEST_F(ReportMessagingTest, with_buffering)
+{
+    EXPECT_CALL(
+        mock_messaging,
+        sendAsyncMessage(
+            _,
+            _,
+            "{\n"
+            "    \"log\": {\n"
+            "        \"eventTime\": \"Best Time ever\",\n"
+            "        \"eventName\": \"test\",\n"
+            "        \"eventSeverity\": \"Info\",\n"
+            "        \"eventPriority\": \"Low\",\n"
+            "        \"eventType\": \"Event Driven\",\n"
+            "        \"eventLevel\": \"Log\",\n"
+            "        \"eventLogLevel\": \"info\",\n"
+            "        \"eventAudience\": \"Internal\",\n"
+            "        \"eventAudienceTeam\": \"Agent Core\",\n"
+            "        \"eventFrequency\": 0,\n"
+            "        \"eventTags\": [\n"
+            "            \"Access Control\"\n"
+            "        ],\n"
+            "        \"eventSource\": {\n"
+            "            \"eventTraceId\": \"\",\n"
+            "            \"eventSpanId\": \"\",\n"
+            "            \"issuingEngineVersion\": \"\",\n"
+            "            \"serviceName\": \"Unnamed Nano Service\"\n"
+            "        },\n"
+            "        \"eventData\": {\n"
+            "            \"eventObject\": 1\n"
+            "        }\n"
+            "    }\n"
+            "}",
+            _,
+            _,
+            true
+        )
+    ).Times(1);
+    ReportMessaging report("test", ReportIS::AudienceTeam::AGENT_CORE, 1, ReportIS::Tags::ACCESS_CONTROL);
+    report.setForceBuffering(true);
 }

 TEST_F(ReportMessagingTest, with_dynamic_fields)
@@ -140,6 +224,7 @@ TEST_F(ReportMessagingTest, with_dynamic_fields)
            "    }\n"
            "}",
            _,
+            _,
            _
        )
    ).Times(1);
@@ -189,6 +274,7 @@ TEST_F(ReportMessagingTest, custom_event_object)
            "    }\n"
            "}",
            _,
+            _,
            _
        )
    ).Times(1);
@@ -243,6 +329,7 @@ TEST_F(ReportMessagingTest, custom_priority)
            "    }\n"
            "}",
            _,
+            _,
            _
        )
    ).Times(1);
@@ -309,6 +396,7 @@ TEST_F(ReportMessagingTest, with_env_details)
            "    }\n"
            "}",
            _,
+            _,
            _
        )
    ).Times(1);
--- a/components/security_apps/http_geo_filter/CMakeLists.txt
+++ b/components/security_apps/http_geo_filter/CMakeLists.txt
@@ -1 +1,5 @@
+include_directories(../waap/include)
+include_directories(../waap/waap_clib)
+include_directories(../../attachment-intakers/nginx_attachment)
+
 add_library(http_geo_filter http_geo_filter.cc)
--- a/components/security_apps/http_geo_filter/http_geo_filter.cc
+++ b/components/security_apps/http_geo_filter/http_geo_filter.cc
@@ -4,10 +4,16 @@
 #include <unistd.h>
 #include <stddef.h>
 #include <algorithm>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <boost/algorithm/string.hpp>

+#include "cidrs_data.h"
 #include "generic_rulebase/generic_rulebase.h"
 #include "generic_rulebase/parameters_config.h"
 #include "generic_rulebase/triggers_config.h"
+#include "user_identifiers_config.h"
 #include "debug.h"
 #include "config.h"
 #include "rest.h"
@@ -21,9 +27,10 @@ USE_DEBUG_FLAG(D_GEO_FILTER);

 static const LogTriggerConf default_triger;

-class HttpGeoFilter::Impl : public Listener<NewHttpTransactionEvent>
+class HttpGeoFilter::Impl : public Listener<HttpRequestHeaderEvent>
 {
 public:
+
    void
    init()
    {
@@ -55,32 +62,42 @@ public:
    }

    EventVerdict
-    respond(const NewHttpTransactionEvent &event) override
+    respond(const HttpRequestHeaderEvent &event) override
    {
        dbgTrace(D_GEO_FILTER) << getListenerName() << " new transaction event";

-        if (!ParameterException::isGeoLocationExceptionExists() &&
-            !getConfiguration<GeoConfig>("rulebase", "httpGeoFilter").ok()
-        ) {
-            dbgTrace(D_GEO_FILTER) << "No geo location practice nor exception was found. Returning default verdict";
+        if (!event.isLastHeader()) return EventVerdict(ngx_http_cp_verdict_e::TRAFFIC_VERDICT_INSPECT);
+        std::set<std::string> xff_set;
+        auto env = Singleton::Consume<I_Environment>::by<HttpGeoFilter>();
+        auto maybe_xff = env->get<std::string>(HttpTransactionData::xff_vals_ctx);
+        if (!maybe_xff.ok()) {
+            dbgTrace(D_GEO_FILTER) << "failed to get xff vals from env";
+        } else {
+            xff_set = split(maybe_xff.unpack(), ',');
+        }
+        dbgDebug(D_GEO_FILTER) << getListenerName() << " last header, start lookup";
+
+        if (xff_set.size() > 0) {
+            removeTrustedIpsFromXff(xff_set);
+        } else {
+            dbgDebug(D_GEO_FILTER) << "xff not found in headers";
+        }
+
+        auto maybe_source_ip = env->get<IPAddr>(HttpTransactionData::client_ip_ctx);
+        if (!maybe_source_ip.ok()) {
+            dbgWarning(D_GEO_FILTER) << "failed to get source ip from env";
            return EventVerdict(default_action);
        }

-        I_GeoLocation *i_geo_location = Singleton::Consume<I_GeoLocation>::by<HttpGeoFilter>();
-        auto asset_location = i_geo_location->lookupLocation(event.getSourceIP());
-        if (!asset_location.ok()) {
-            dbgTrace(D_GEO_FILTER) << "Lookup location failed, Error: " << asset_location.getErr();
-            return EventVerdict(default_action);
-        }
+        auto source_ip = convertIpAddrToString(maybe_source_ip.unpack());
+        xff_set.insert(source_ip);

-        EnumArray<I_GeoLocation::GeoLocationField, std::string> geo_location_data = asset_location.unpack();
-
-        ngx_http_cp_verdict_e exception_verdict = getExceptionVerdict(event, geo_location_data);
+        ngx_http_cp_verdict_e exception_verdict = getExceptionVerdict(xff_set);
        if (exception_verdict != ngx_http_cp_verdict_e::TRAFFIC_VERDICT_IRRELEVANT) {
            return EventVerdict(exception_verdict);
        }

-        ngx_http_cp_verdict_e geo_lookup_verdict = getGeoLookupVerdict(event, geo_location_data);
+        ngx_http_cp_verdict_e geo_lookup_verdict = getGeoLookupVerdict(xff_set);
        if (geo_lookup_verdict != ngx_http_cp_verdict_e::TRAFFIC_VERDICT_IRRELEVANT) {
            return EventVerdict(geo_lookup_verdict);
        }
@@ -88,6 +105,73 @@ public:
    }

 private:
+    std::set<std::string>
+    split(const std::string& s, char delim) {
+        std::set<std::string> elems;
+        std::stringstream ss(s);
+        std::string value;
+        while (std::getline(ss, value, delim)) {
+            elems.insert(trim(value));
+        }
+        return elems;
+    }
+
+    static inline std::string &ltrim(std::string &s) {
+        s.erase(s.begin(), std::find_if(s.begin(), s.end(),
+            [] (char c) { return !std::isspace(c); }));
+        return s;
+    }
+
+    // trim from end
+    static inline std::string &rtrim(std::string &s) {
+        s.erase(std::find_if(s.rbegin(), s.rend(),
+            [] (char c) { return !std::isspace(c); }).base(), s.end());
+        return s;
+    }
+
+    // trim from both ends
+    static inline std::string &trim(std::string &s) {
+        return ltrim(rtrim(s));
+    }
+
+    void
+    removeTrustedIpsFromXff(std::set<std::string> &xff_set)
+    {
+        auto identify_config = getConfiguration<UsersAllIdentifiersConfig>(
+            "rulebase",
+            "usersIdentifiers"
+        );
+        if (!identify_config.ok()) {
+            dbgDebug(D_GEO_FILTER) << "did not find users identifiers definition in policy";
+        } else {
+            auto trusted_ips = (*identify_config).getHeaderValuesFromConfig("x-forwarded-for");
+            for (auto it = xff_set.begin(); it != xff_set.end();) {
+                if (isIpTrusted(*it, trusted_ips)) {
+                    dbgTrace(D_GEO_FILTER) << "xff value is in trusted ips: " << *it;
+                    it = xff_set.erase(it);
+                } else {
+                    dbgTrace(D_GEO_FILTER) << "xff value is not in trusted ips: " << *it;
+                    ++it;
+                }
+            }
+        }
+    }
+
+    bool
+    isIpTrusted(const string &ip, const vector<string> &trusted_ips)
+    {
+        for (const auto &trusted_ip : trusted_ips) {
+            CIDRSData cidr_data(trusted_ip);
+            if (
+                ip == trusted_ip ||
+                (cidr_data.contains(ip))
+            ) {
+                return true;
+            }
+        }
+        return false;
+    }
+
    string
    convertIpAddrToString(const IPAddr &ip_to_convert)
    {
@@ -117,54 +201,75 @@ private:
    }

    ngx_http_cp_verdict_e
-    getGeoLookupVerdict(
-        const NewHttpTransactionEvent &event,
-        const EnumArray<I_GeoLocation::GeoLocationField, std::string> &geo_location_data)
+    getGeoLookupVerdict(const std::set<std::string> &sources)
    {
        auto maybe_geo_config = getConfiguration<GeoConfig>("rulebase", "httpGeoFilter");
        if (!maybe_geo_config.ok()) {
-            dbgWarning(D_GEO_FILTER) << "Failed to load HTTP Geo Filter config. Error:" << maybe_geo_config.getErr();
+            dbgTrace(D_GEO_FILTER) << "Failed to load HTTP Geo Filter config. Error:" << maybe_geo_config.getErr();
            return ngx_http_cp_verdict_e::TRAFFIC_VERDICT_IRRELEVANT;
        }
        GeoConfig geo_config = maybe_geo_config.unpack();
-        string country_code = geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_CODE];
+        EnumArray<I_GeoLocation::GeoLocationField, std::string> geo_location_data;
+        I_GeoLocation *i_geo_location = Singleton::Consume<I_GeoLocation>::by<HttpGeoFilter>();

-        if (geo_config.isAllowedCountry(country_code)) {
-            dbgTrace(D_GEO_FILTER)
-                << "geo verdict ACCEPT, practice id: "
-                << geo_config.getId()
-                << ", country code: "
-                << country_code;
-            generateVerdictLog(
-                ngx_http_cp_verdict_e::TRAFFIC_VERDICT_ACCEPT,
-                event,
-                geo_config.getId(),
-                true,
-                geo_location_data
-            );
-            return ngx_http_cp_verdict_e::TRAFFIC_VERDICT_ACCEPT;
-        }
-        if (geo_config.isBlockedCountry(country_code)) {
-            dbgTrace(D_GEO_FILTER)
-                << "geo verdict DROP, practice id: "
-                << geo_config.getId()
-                << ", country code: "
-                << country_code;
-            generateVerdictLog(
-                ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP,
-                event,
-                geo_config.getId(),
-                true,
-                geo_location_data
-            );
-            return ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP;
+        for (const std::string& source : sources) {
+            Maybe<IPAddr> maybe_source_ip = IPAddr::createIPAddr(source);
+            if (!maybe_source_ip.ok()){
+                dbgWarning(D_GEO_FILTER) <<
+                "create ip address failed for source: " <<
+                source <<
+                ", Error: " <<
+                maybe_source_ip.getErr();
+                continue;
+            }
+            auto asset_location = i_geo_location->lookupLocation(maybe_source_ip.unpack());
+            if (!asset_location.ok()) {
+                dbgWarning(D_GEO_FILTER) <<
+                "Lookup location failed for source: " <<
+                source <<
+                ", Error: " <<
+                asset_location.getErr();
+                continue;
+            }
+
+            geo_location_data = asset_location.unpack();
+
+            string country_code = geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_CODE];
+
+            if (geo_config.isAllowedCountry(country_code)) {
+                dbgTrace(D_GEO_FILTER)
+                    << "geo verdict ACCEPT, practice id: "
+                    << geo_config.getId()
+                    << ", country code: "
+                    << country_code;
+                generateVerdictLog(
+                    ngx_http_cp_verdict_e::TRAFFIC_VERDICT_ACCEPT,
+                    geo_config.getId(),
+                    true,
+                    geo_location_data
+                );
+                return ngx_http_cp_verdict_e::TRAFFIC_VERDICT_ACCEPT;
+            }
+            if (geo_config.isBlockedCountry(country_code)) {
+                dbgTrace(D_GEO_FILTER)
+                    << "geo verdict DROP, practice id: "
+                    << geo_config.getId()
+                    << ", country code: "
+                    << country_code;
+                generateVerdictLog(
+                    ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP,
+                    geo_config.getId(),
+                    true,
+                    geo_location_data
+                );
+                return ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP;
+            }
        }
        dbgTrace(D_GEO_FILTER)
            << "No matched practice. Returned default action: "
            << geo_config.getDefaultAction();
        generateVerdictLog(
            convertActionToVerdict(geo_config.getDefaultAction()),
-            event,
            geo_config.getId(),
            true,
            geo_location_data,
@@ -176,7 +281,6 @@ private:
    Maybe<pair<ngx_http_cp_verdict_e, string>>
    getBehaviorsVerdict(
        const unordered_map<string, set<string>> &behaviors_map_to_search,
-        const NewHttpTransactionEvent &event,
        EnumArray<I_GeoLocation::GeoLocationField, std::string> geo_location_data)
    {
        bool is_matched = false;
@@ -193,7 +297,6 @@ private:
                dbgTrace(D_GEO_FILTER) << "behavior verdict: DROP, exception id: " << behavior.getId();
                generateVerdictLog(
                    matched_verdict,
-                    event,
                    behavior.getId(),
                    false,
                    geo_location_data
@@ -218,63 +321,74 @@ private:
    }

    ngx_http_cp_verdict_e
-    getExceptionVerdict(
-        const NewHttpTransactionEvent &event,
-        EnumArray<I_GeoLocation::GeoLocationField, std::string> geo_location_data
-    ){
-        string country_code = geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_CODE];
-        string country_name = geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_NAME];
-        string source_ip = convertIpAddrToString(event.getSourceIP());
+    getExceptionVerdict(const std::set<std::string> &sources) {

        pair<ngx_http_cp_verdict_e, string> curr_matched_behavior;
        ngx_http_cp_verdict_e verdict = ngx_http_cp_verdict_e::TRAFFIC_VERDICT_IRRELEVANT;
+        I_GeoLocation *i_geo_location = Singleton::Consume<I_GeoLocation>::by<HttpGeoFilter>();
+        EnumArray<I_GeoLocation::GeoLocationField, std::string> geo_location_data;

-        dbgTrace(D_GEO_FILTER)
+        for (const std::string& source : sources) {
+
+            Maybe<IPAddr> maybe_source_ip = IPAddr::createIPAddr(source);
+            if (!maybe_source_ip.ok()){
+                dbgWarning(D_GEO_FILTER) <<
+                "create ip address failed for source: " <<
+                source <<
+                ", Error: " <<
+                maybe_source_ip.getErr();
+                continue;
+            }
+
+
+            auto asset_location = i_geo_location->lookupLocation(maybe_source_ip.unpack());
+            if (!asset_location.ok()) {
+                dbgWarning(D_GEO_FILTER) << "Lookup location failed for source: " <<
+                source <<
+                ", Error: " <<
+                asset_location.getErr();
+                continue;
+            }
+            geo_location_data = asset_location.unpack();
+            string country_code = geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_CODE];
+            string country_name = geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_NAME];
+            dbgTrace(D_GEO_FILTER)
            << "Get exception verdict. "
            << "country code: "
            << country_code
            << ", country name: "
            << country_name
            << ", source ip address: "
-            << source_ip;
+            << source;

-        unordered_map<string, set<string>> exception_value_source_ip = {{"sourceIP", {source_ip}}};
-        auto matched_behavior_maybe = getBehaviorsVerdict(exception_value_source_ip, event, geo_location_data);
-        if (matched_behavior_maybe.ok()) {
-            curr_matched_behavior = matched_behavior_maybe.unpack();
-            verdict = curr_matched_behavior.first;
-            if (verdict == ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP) {
-                return verdict;
+            unordered_map<string, set<string>> exception_value_country_code = {
+                {"countryCode", {country_code}}
+            };
+            auto matched_behavior_maybe = getBehaviorsVerdict(exception_value_country_code, geo_location_data);
+            if (matched_behavior_maybe.ok()) {
+                curr_matched_behavior = matched_behavior_maybe.unpack();
+                verdict = curr_matched_behavior.first;
+                if (verdict == ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP) {
+                    return verdict;
+                }
+            }
+
+            unordered_map<string, set<string>> exception_value_country_name = {
+                {"countryName", {country_name}}
+            };
+            matched_behavior_maybe = getBehaviorsVerdict(exception_value_country_name, geo_location_data);
+            if (matched_behavior_maybe.ok()) {
+                curr_matched_behavior = matched_behavior_maybe.unpack();
+                verdict = curr_matched_behavior.first;
+                if (verdict == ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP) {
+                    return verdict;
+                }
            }
        }

-        unordered_map<string, set<string>> exception_value_country_code = {
-            {"countryCode", {country_code}}
-        };
-        matched_behavior_maybe = getBehaviorsVerdict(exception_value_country_code, event, geo_location_data);
-        if (matched_behavior_maybe.ok()) {
-            curr_matched_behavior = matched_behavior_maybe.unpack();
-            verdict = curr_matched_behavior.first;
-            if (verdict == ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP) {
-                return verdict;
-            }
-        }
-
-        unordered_map<string, set<string>> exception_value_country_name = {
-            {"countryName", {country_name}}
-        };
-        matched_behavior_maybe = getBehaviorsVerdict(exception_value_country_name, event, geo_location_data);
-        if (matched_behavior_maybe.ok()) {
-            curr_matched_behavior = matched_behavior_maybe.unpack();
-            verdict = curr_matched_behavior.first;
-            if (verdict == ngx_http_cp_verdict_e::TRAFFIC_VERDICT_DROP) {
-                return verdict;
-            }
-        }
        if (verdict == ngx_http_cp_verdict_e::TRAFFIC_VERDICT_ACCEPT) {
            generateVerdictLog(
                verdict,
-                event,
                curr_matched_behavior.second,
                false,
                geo_location_data
@@ -286,7 +400,6 @@ private:
    void
    generateVerdictLog(
        const ngx_http_cp_verdict_e &verdict,
-        const NewHttpTransactionEvent &event,
        const string &matched_id,
        bool is_geo_filter,
        const EnumArray<I_GeoLocation::GeoLocationField, std::string> geo_location_data,
@@ -307,14 +420,27 @@ private:
            LogField(matched_on, matched_id),
            ReportIS::Tags::HTTP_GEO_FILTER
        );
-        log
-            << LogField("sourceIP", convertIpAddrToString(event.getSourceIP()))
-            << LogField("sourcePort", event.getSourcePort())
-            << LogField("hostName", event.getDestinationHost())
-            << LogField("httpMethod", event.getHttpMethod())
-            << LogField("securityAction", is_prevent ? "Prevent" : "Detect");
+        auto env = Singleton::Consume<I_Environment>::by<HttpGeoFilter>();
+        auto source_ip = env->get<IPAddr>(HttpTransactionData::client_ip_ctx);
+        if (source_ip.ok()) log << LogField("sourceIP", convertIpAddrToString(source_ip.unpack()));
+
+        auto source_identifier = env->get<string>(HttpTransactionData::source_identifier);
+        if (source_identifier.ok()) log << LogField("httpSourceId", source_identifier.unpack());
+
+        auto source_port = env->get<string>(HttpTransactionData::client_port_ctx);
+        if (source_port.ok()) log << LogField("sourcePort", source_port.unpack());
+
+        auto host_name = env->get<string>(HttpTransactionData::host_name_ctx);
+        if (host_name.ok()) log << LogField("hostName", host_name.unpack());
+
+        auto method = env->get<string>(HttpTransactionData::method_ctx);
+        if (method.ok()) log << LogField("httpMethod", method.unpack());
+
+        log << LogField("securityAction", is_prevent ? "Prevent" : "Detect");

        if (is_default_action) log << LogField("isDefaultSecurityAction", true);
+        auto xff = env->get<string>(HttpTransactionData::xff_vals_ctx);
+        if (xff.ok()) log << LogField("proxyIP", xff.unpack());

        log
            << LogField("sourceCountryCode", geo_location_data[I_GeoLocation::GeoLocationField::COUNTRY_CODE])
--- a/components/security_apps/ips/include/ips_basic_policy.h
+++ b/components/security_apps/ips/include/ips_basic_policy.h
@@ -50,9 +50,13 @@ public:

 private:
    void readRules(cereal::JSONInputArchive &ar);
+    void readTriggerId(cereal::JSONInputArchive &ar);
+    void readExceptionId(cereal::JSONInputArchive &ar);
    void readDefaultAction(cereal::JSONInputArchive &ar);

    std::vector<Rule> rules;
+    std::string trigger_id;
+    std::string exception_id;
 };

 #endif // __IPS_BASIC_POLICY_H__
--- a/components/security_apps/ips/include/ips_signatures.h
+++ b/components/security_apps/ips/include/ips_signatures.h
@@ -27,6 +27,7 @@
 #include "log_generator.h"
 #include "parsed_context.h"
 #include "pm_hook.h"
+#include "i_generic_rulebase.h"

 /// \namespace IPSSignatureSubTypes
 /// \brief Namespace containing subtypes for IPS signatures.
@@ -348,8 +349,16 @@ public:
    /// \brief Construct a SignatureAndAction object.
    /// \param _signature The complete signature.
    /// \param _action The signature action.
-    SignatureAndAction(std::shared_ptr<CompleteSignature> _signature, SignatureAction _action) :
-        signature(_signature), action(_action)
+    SignatureAndAction(
+        std::shared_ptr<CompleteSignature> _signature,
+        SignatureAction _action,
+        std::string _trigger_id,
+        std::string _exception_id)
+            :
+        signature(_signature),
+        action(_action),
+        trigger_id(_trigger_id),
+        exception_id(_exception_id)
    {}

    /// \brief Check if the signature is matched for prevention.
@@ -375,6 +384,11 @@ public:
        return signature->getContext();
    }

+    LogTriggerConf getTrigger() const;
+
+    std::set<ParameterBehavior>
+    getBehavior(const std::unordered_map<std::string, std::set<std::string>> &exceptions_dict) const;
+
 private:
    /// \brief Get the action results for the IPS state.
    /// \param ips_state The IPS entry.
@@ -382,6 +396,8 @@ private:

    std::shared_ptr<CompleteSignature> signature;
    SignatureAction action;
+    std::string trigger_id;
+    std::string exception_id;
 };
 } // namespace IPSSignatureSubTypes

--- a/components/security_apps/ips/include/snort_basic_policy.h
+++ b/components/security_apps/ips/include/snort_basic_policy.h
@@ -17,6 +17,8 @@ public:
 private:
    IPSSignatureSubTypes::SignatureAction action = IPSSignatureSubTypes::SignatureAction::IGNORE;
    std::vector<std::string> file_names;
+    std::string trigger_id;
+    std::string exception_id;
 };

 #endif // __SNORT_BASIC_POLICY_H__
--- a/components/security_apps/ips/ips_basic_policy.cc
+++ b/components/security_apps/ips/ips_basic_policy.cc
@@ -17,6 +17,8 @@ void
 RuleSelector::load(cereal::JSONInputArchive &ar)
 {
    readRules(ar);
+    readTriggerId(ar);
+    readExceptionId(ar);
    readDefaultAction(ar);
 }

@@ -36,7 +38,7 @@ RuleSelector::selectSignatures() const
            if (rule.isSignaturedMatched(*signature)) {
                if (rule.getAction() != IPSSignatureSubTypes::SignatureAction::IGNORE) {
                    signature->setIndicators("Check Point", signatures_version);
-                    res.emplace_back(signature, rule.getAction());
+                    res.emplace_back(signature, rule.getAction(), trigger_id, exception_id);
                }
                break;
            }
@@ -52,6 +54,28 @@ RuleSelector::readRules(cereal::JSONInputArchive &ar)
    ar(cereal::make_nvp("rules", rules));
 }

+void
+RuleSelector::readTriggerId(cereal::JSONInputArchive &ar)
+{
+    try {
+        ar(cereal::make_nvp("triggers", trigger_id));
+    } catch (const cereal::Exception &e) {
+        ar.setNextName(nullptr);
+        trigger_id = "";
+    }
+}
+
+void
+RuleSelector::readExceptionId(cereal::JSONInputArchive &ar)
+{
+    try {
+        ar(cereal::make_nvp("exceptions", exception_id));
+    } catch (const cereal::Exception &e) {
+        ar.setNextName(nullptr);
+        exception_id = "";
+    }
+}
+
 void
 RuleSelector::readDefaultAction(cereal::JSONInputArchive &ar)
 {
--- a/components/security_apps/ips/ips_signatures.cc
+++ b/components/security_apps/ips/ips_signatures.cc
@@ -280,8 +280,7 @@ SignatureAndAction::getAction(const IPSEntry &ips_state) const
        exceptions_dict["sourceIdentifier"].insert(*env_source_identifier);
    }

-    I_GenericRulebase *i_rulebase = Singleton::Consume<I_GenericRulebase>::by<IPSComp>();
-    auto behaviors = i_rulebase->getBehavior(exceptions_dict);
+    auto behaviors = getBehavior(exceptions_dict);

    set<BehaviorValue> override_actions;
    vector<string> override_ids;
@@ -315,6 +314,23 @@ static const auto url_query = LogTriggerConf::WebLogFields::webUrlQuery;
 static const auto res_body = LogTriggerConf::WebLogFields::responseBody;
 static const auto res_code = LogTriggerConf::WebLogFields::responseCode;

+LogTriggerConf
+SignatureAndAction::getTrigger() const
+{
+    if (trigger_id.empty()) return getConfigurationWithDefault(LogTriggerConf(), "rulebase", "log");
+
+    return Singleton::Consume<I_GenericRulebase>::by<IPSComp>()->getLogTriggerConf(trigger_id);
+}
+
+set<ParameterBehavior>
+SignatureAndAction::getBehavior(const unordered_map<string, set<string>> &exceptions_dict) const
+{
+    I_GenericRulebase *i_rulebase = Singleton::Consume<I_GenericRulebase>::by<IPSComp>();
+    if (exception_id.empty()) return i_rulebase->getBehavior(exceptions_dict);
+
+    return i_rulebase->getParameterException(exception_id).getBehavior(exceptions_dict);
+}
+
 bool
 SignatureAndAction::matchSilent(const Buffer &sample) const
 {
@@ -398,7 +414,7 @@ SignatureAndAction::isMatchedPrevent(const Buffer &context_buffer, const set<PMP

    dbgDebug(D_IPS) << "Signature matched - sending log";

-    auto &trigger = getConfigurationWithDefault(default_triger, "rulebase", "log");
+    auto trigger = getTrigger();
    bool is_prevent = get<0>(override_action) == IPSSignatureSubTypes::SignatureAction::PREVENT;

    auto severity = signature->getSeverity() < IPSLevel::HIGH ? Severity::HIGH : Severity::CRITICAL;
--- a/components/security_apps/ips/ips_ut/component_ut.cc
+++ b/components/security_apps/ips/ips_ut/component_ut.cc
@@ -596,6 +596,8 @@ TEST_F(ComponentTest, check_filtering_by_year)

 TEST_F(ComponentTest, log_fields)
 {
+    generic_rulebase.preload();
+    generic_rulebase.init();
    string config =
        "{"
            "\"IPS\": {"
@@ -632,6 +634,8 @@ TEST_F(ComponentTest, log_fields)
                        "\"assetId\": \"1-1-1\","
                        "\"practiceId\": \"2-2-2\","
                        "\"practiceName\": \"practice1\","
+                        "\"triggers\": \"5eaeefde6765c30010bae8b6\","
+                        "\"exceptions\": \"\","
                        "\"defaultAction\": \"Detect\","
                        "\"rules\": ["
                            "{"
@@ -643,10 +647,36 @@ TEST_F(ComponentTest, log_fields)
                        "]"
                    "}"
                "]"
+            "},"
+            "\"rulebase\": {"
+                "\"log\": ["
+                    "{"
+                        "\"context\": \"triggerId(5eaeefde6765c30010bae8b6)\","
+                        "\"triggerName\": \"Logging Trigger\","
+                        "\"triggerType\": \"log\","
+                        "\"urlForSyslog\": \"\","
+                        "\"urlForCef\": \"128.1.1.1:333\","
+                        "\"acAllow\": false,"
+                        "\"acDrop\": true,"
+                        "\"complianceViolations\": true,"
+                        "\"complianceWarnings\": true,"
+                        "\"logToAgent\": true,"
+                        "\"logToCloud\": true,"
+                        "\"logToSyslog\": false,"
+                        "\"logToCef\": true,"
+                        "\"tpDetect\": true,"
+                        "\"tpPrevent\": true,"
+                        "\"verbosity\": \"Standard\","
+                        "\"webBody\": true,"
+                        "\"webHeaders\": true,"
+                        "\"webRequests\": true,"
+                        "\"webUrlPath\": true,"
+                        "\"webUrlQuery\": true"
+                    "}"
+                "]"
            "}"
        "}";
    loadPolicy(config);
-    setTrigger();

    EXPECT_CALL(table, createStateRValueRemoved(_, _));
    EXPECT_CALL(table, getState(_)).WillRepeatedly(Return(&entry));
@@ -829,6 +859,8 @@ TEST_F(ComponentTest, prxeem_exception_bug)
        "                \"practiceId\": \"2-2-2\","
        "                \"practiceName\": \"practice1\","
        "                \"defaultAction\": \"Prevent\","
+        "                \"triggers\": \"\","
+        "                \"exceptions\": \"6c3867be-4da5-42c2-93dc-8f509a764004\","
        "                \"rules\": []"
        "            }"
        "        ]"
@@ -847,6 +879,11 @@ TEST_F(ComponentTest, prxeem_exception_bug)
        "                       \"parameterId\": \"6c3867be-4da5-42c2-93dc-8f509a764003\","
        "                       \"parameterType\": \"exceptions\","
        "                       \"parameterName\": \"exception\""
+        "                    },"
+        "                    {"
+        "                       \"parameterId\": \"6c3867be-4da5-42c2-93dc-8f509a764004\","
+        "                       \"parameterType\": \"exceptions\","
+        "                       \"parameterName\": \"exception\""
        "                    }"
        "                ],"
        "                \"zoneId\": \"\","
@@ -855,7 +892,7 @@ TEST_F(ComponentTest, prxeem_exception_bug)
        "        ],"
        "        \"exception\": ["
        "            {"
-        "                \"context\": \"parameterId(6c3867be-4da5-42c2-93dc-8f509a764003)\","
+        "                \"context\": \"parameterId(6c3867be-4da5-42c2-93dc-8f509a764004)\","
        "                \"match\": {"
        "                   \"type\": \"operator\","
        "                   \"op\": \"and\","
--- a/components/security_apps/ips/snort_basic_policy.cc
+++ b/components/security_apps/ips/snort_basic_policy.cc
@@ -16,6 +16,19 @@ using namespace std;
 void
 SnortRuleSelector::load(cereal::JSONInputArchive &ar)
 {
+    try {
+        ar(cereal::make_nvp("triggers", trigger_id));
+    } catch (const cereal::Exception &e) {
+        ar.setNextName(nullptr);
+        trigger_id = "";
+    }
+
+    try {
+        ar(cereal::make_nvp("exceptions", exception_id));
+    } catch (const cereal::Exception &e) {
+        ar.setNextName(nullptr);
+        exception_id = "";
+    }
    string mode;
    ar(cereal::make_nvp("mode", mode), cereal::make_nvp("files", file_names));

@@ -38,7 +51,7 @@ SnortRuleSelector::selectSignatures() const

    for (auto &file : file_names) {
        for (auto &signature : (*signatures).getSignatures(file)) {
-            res.emplace_back(signature, action);
+            res.emplace_back(signature, action, trigger_id, exception_id);
        }
    }
    return res;
--- a/components/security_apps/layer_7_access_control/layer_7_access_control.cc
+++ b/components/security_apps/layer_7_access_control/layer_7_access_control.cc
@@ -37,6 +37,7 @@ public:
            if (!ipv4_addresses.empty()) ipv4_address = ipv4_addresses.front();
        } catch (const cereal::Exception &e) {
            dbgWarning(D_L7_ACCESS_CONTROL) << "Failed to load IP reputation data JSON. Error: " << e.what();
+            ar.setNextName(nullptr);
        }
    }

@@ -384,8 +385,29 @@ Layer7AccessControl::Impl::init()
    i_intelligence = Singleton::Consume<I_Intelligence_IS_V2>::by<Layer7AccessControl>();
    i_mainloop = Singleton::Consume<I_MainLoop>::by<Layer7AccessControl>();

-    chrono::minutes expiration(
-        getProfileAgentSettingWithDefault<uint>(60u, "layer7AccessControl.crowdsec.cacheExpiration")
+    int cache_expiration_in_seconds = 30;
+    string cache_expiration_env = getenv("CROWDSEC_CACHE_EXPIRATION") ? getenv("CROWDSEC_CACHE_EXPIRATION") : "";
+    if (!cache_expiration_env.empty()) {
+        if (
+            all_of(cache_expiration_env.begin(), cache_expiration_env.end(), ::isdigit)
+            && stoi(cache_expiration_env) > 0
+        ) {
+            cache_expiration_in_seconds = stoi(cache_expiration_env);
+            dbgInfo(D_L7_ACCESS_CONTROL)
+                << "Successfully read cache expiration value from env: "
+                << cache_expiration_env;
+        } else {
+            dbgWarning(D_L7_ACCESS_CONTROL)
+                << "An invalid cache expiration value was provided in env: "
+                << cache_expiration_env;
+        }
+    }
+
+    chrono::seconds expiration(
+        getProfileAgentSettingWithDefault<uint>(
+            cache_expiration_in_seconds,
+            "layer7AccessControl.crowdsec.cacheExpiration"
+        )
    );

    ip_reputation_cache.startExpiration(
--- a/components/security_apps/layer_7_access_control/layer_7_access_control_ut/layer_7_access_control_ut.cc
+++ b/components/security_apps/layer_7_access_control/layer_7_access_control_ut/layer_7_access_control_ut.cc
@@ -142,6 +142,13 @@ string disabled_settings =
        "}"
    "],\n";

+
+string local_intelligence =
+    "\"intelligence\":{"
+    "  \"local intelligence server ip\":\"127.0.0.1\","
+    "  \"local intelligence server primary port\":9090"
+    "}\n,";
+
 string policy =
    "\"rulebase\": {"
        "\"usersIdentifiers\": ["
@@ -259,7 +266,7 @@ Layer7AccessControlTest::verifyReport(

 TEST_F(Layer7AccessControlTest, ReturnAcceptVerdict)
 {
-    stringstream ss_conf(prevent_settings + policy);
+    stringstream ss_conf(prevent_settings + local_intelligence + policy);
    Singleton::Consume<Config::I_Config>::from(config)->loadConfiguration(ss_conf);

    string intelligence_response_ok = loadIntelligenceResponse("data/ok_intelligence_response.json");
@@ -305,7 +312,7 @@ TEST_F(Layer7AccessControlTest, ReturnAcceptVerdict)

 TEST_F(Layer7AccessControlTest, ReturnDropVerdictOnMaliciousReputation)
 {
-    stringstream ss_conf(prevent_settings + policy);
+    stringstream ss_conf(prevent_settings + local_intelligence + policy);
    Singleton::Consume<Config::I_Config>::from(config)->loadConfiguration(ss_conf);
    
    string malicious_intelligence_response = loadIntelligenceResponse("data/malicious_intelligence_response.json");
@@ -351,7 +358,7 @@ TEST_F(Layer7AccessControlTest, ReturnDropVerdictOnMaliciousReputation)

 TEST_F(Layer7AccessControlTest, ReturnDropVerdictCacheBased)
 {
-    stringstream ss_conf(prevent_settings + policy);
+    stringstream ss_conf(prevent_settings + local_intelligence + policy);
    Singleton::Consume<Config::I_Config>::from(config)->loadConfiguration(ss_conf);

    string malicious_intelligence_response = loadIntelligenceResponse("data/malicious_intelligence_response.json");
@@ -403,7 +410,7 @@ TEST_F(Layer7AccessControlTest, ReturnDropVerdictCacheBased)

 TEST_F(Layer7AccessControlTest, AcceptOnDetect)
 {
-    stringstream ss_conf(detect_settings + policy);
+    stringstream ss_conf(detect_settings + local_intelligence + policy);
    Singleton::Consume<Config::I_Config>::from(config)->loadConfiguration(ss_conf);
    
    string malicious_intelligence_response = loadIntelligenceResponse("data/malicious_intelligence_response.json");
@@ -449,7 +456,7 @@ TEST_F(Layer7AccessControlTest, AcceptOnDetect)

 TEST_F(Layer7AccessControlTest, FallbackToSourceIPAndDrop)
 {
-    stringstream ss_conf(prevent_settings + policy);
+    stringstream ss_conf(prevent_settings + local_intelligence + policy);
    Singleton::Consume<Config::I_Config>::from(config)->loadConfiguration(ss_conf);

    string malicious_intelligence_response = loadIntelligenceResponse("data/malicious_intelligence_response.json");
--- a/components/security_apps/local_policy_mgmt_gen/access_control_practice.cc
+++ b/components/security_apps/local_policy_mgmt_gen/access_control_practice.cc
@@ -12,20 +12,34 @@
 // limitations under the License.

 #include "access_control_practice.h"
+#include "new_practice.h"

 using namespace std;

 USE_DEBUG_FLAG(D_LOCAL_POLICY);
 // LCOV_EXCL_START Reason: no test exist

-static const map<string, string> valid_modes_to_key = {
+static const set<string> valid_modes = {
+    "prevent",
+    "detect",
+    "inactive",
+    "prevent-learn",
+    "detect-learn",
+    "as-top-level",
+    "inherited"
+};
+
+static const unordered_map<string, string> valid_modes_to_key = {
    {"prevent", "Active"},
+    {"prevent-learn", "Active"},
    {"detect", "Detect"},
+    {"detect-learn", "Detect"},
    {"inactive", "Inactive"}
 };
+
 static const set<string> valid_units    = {"minute", "second"};

-static const std::unordered_map<std::string, std::string> key_to_units_val = {
+static const unordered_map<std::string, std::string> key_to_units_val = {
    { "second", "Second"},
    { "minute", "Minute"}
 };
@@ -177,13 +191,10 @@ void
 AccessControlRateLimit::load(cereal::JSONInputArchive &archive_in)
 {
    dbgTrace(D_LOCAL_POLICY) << "Loading Access control rate limit";
-    string in_mode;
-    parseAppsecJSONKey<string>("overrideMode", in_mode, archive_in, "detect");
-    if (valid_modes_to_key.find(in_mode) == valid_modes_to_key.end()) {
-        dbgWarning(D_LOCAL_POLICY) << "AppSec access control rate limit override mode invalid: " << in_mode;
-        throw PolicyGenException("AppSec access control rate limit override mode invalid: " + in_mode);
-    } else {
-        mode = valid_modes_to_key.at(in_mode);
+    parseMandatoryAppsecJSONKey<string>("overrideMode", mode, archive_in, "inactive");
+    if (valid_modes.find(mode) == valid_modes.end()) {
+        dbgWarning(D_LOCAL_POLICY) << "AppSec access control rate limit override mode invalid: " << mode;
+        throw PolicyGenException("AppSec access control rate limit override mode invalid: " + mode);
    }
    parseAppsecJSONKey<std::vector<AccessControlRateLimiteRules>>("rules", rules, archive_in);
 }
@@ -205,9 +216,10 @@ AccessControlRateLimit::getRules() const
 }

 const string &
-AccessControlRateLimit::getMode() const
+AccessControlRateLimit::getMode(const std::string &default_mode) const
 {
-    return mode;
+    const string &res = getModeWithDefault(mode, default_mode, valid_modes_to_key);
+    return res;
 }

 void
@@ -216,6 +228,7 @@ AccessControlPracticeSpec::load(cereal::JSONInputArchive &archive_in)
    dbgTrace(D_LOCAL_POLICY) << "Loading AppSec practice spec";

    parseAppsecJSONKey<string>("name", practice_name, archive_in);
+    parseAppsecJSONKey<string>("practiceMode", mode, archive_in);
    parseAppsecJSONKey<string>("appsecClassName", appsec_class_name, archive_in);
    parseMandatoryAppsecJSONKey<AccessControlRateLimit>("rateLimit", rate_limit, archive_in);
 }
@@ -227,7 +240,7 @@ AccessControlPracticeSpec::setName(const string &_name)
 }

 const AccessControlRateLimit &
-AccessControlPracticeSpec::geRateLimit() const
+AccessControlPracticeSpec::getRateLimit() const
 {
    return rate_limit;
 }
@@ -243,4 +256,10 @@ AccessControlPracticeSpec::getName() const
 {
    return practice_name;
 }
+
+const string &
+AccessControlPracticeSpec::getMode(const std::string &default_mode) const
+{
+    return isModeInherited(mode) ? default_mode : mode;
+}
 // LCOV_EXCL_STOP
--- a/components/security_apps/local_policy_mgmt_gen/appsec_practice_section.cc
+++ b/components/security_apps/local_policy_mgmt_gen/appsec_practice_section.cc
@@ -133,7 +133,7 @@ AppSecPracticeWebAttacks::load(cereal::JSONInputArchive &archive_in)
 {
    dbgTrace(D_LOCAL_POLICY) << "Loading AppSec practice spec";
    parseAppsecJSONKey<AppSecWebAttackProtections>("protections", protections, archive_in);
-    parseAppsecJSONKey<string>("override-mode", mode, archive_in, "Unset");
+    parseAppsecJSONKey<string>("override-mode", mode, archive_in, "as-top-level");
    if (valid_modes.count(mode) == 0) {
        dbgWarning(D_LOCAL_POLICY) << "AppSec practice override mode invalid: " << mode;
    }
@@ -187,7 +187,7 @@ AppSecPracticeWebAttacks::getMinimumConfidence() const
 const string &
 AppSecPracticeWebAttacks::getMode(const string &default_mode) const
 {
-    if (mode == "Unset" || (key_to_practices_val2.find(mode) == key_to_practices_val2.end())) {
+    if (isModeInherited(mode) || (key_to_practices_val2.find(mode) == key_to_practices_val2.end())) {
        dbgError(D_LOCAL_POLICY) << "Couldn't find a value for key: " << mode << ". Returning " << default_mode;
        return default_mode;
    }
@@ -429,6 +429,9 @@ WebAppSection::WebAppSection(
    context(_context),
    web_attack_mitigation_severity(parsed_appsec_spec.getWebAttacks().getMinimumConfidence()),
    web_attack_mitigation_mode(parsed_appsec_spec.getWebAttacks().getMode(default_mode)),
+    csrf_protection_mode("Disabled"),
+    open_redirect_mode("Disabled"),
+    error_disclosure_mode("Disabled"),
    practice_advanced_config(parsed_appsec_spec),
    anti_bots(parsed_appsec_spec.getAntiBot()),
    trusted_sources({ parsed_trusted_sources })
@@ -451,6 +454,7 @@ WebAppSection::WebAppSection(
    }
 }

+// Used for V1Beta2
 WebAppSection::WebAppSection(
    const string &_application_urls,
    const string &_asset_id,
@@ -465,7 +469,8 @@ WebAppSection::WebAppSection(
    const PracticeAdvancedConfig &_practice_advanced_config,
    const AppsecPracticeAntiBotSection &_anti_bots,
    const LogTriggerSection &parsed_log_trigger,
-    const AppSecTrustedSources &parsed_trusted_sources)
+    const AppSecTrustedSources &parsed_trusted_sources,
+    const NewAppSecWebAttackProtections &protections)
    :
    application_urls(_application_urls),
    asset_id(_asset_id),
@@ -489,6 +494,10 @@ WebAppSection::WebAppSection(
        web_attack_mitigation_severity == "medium" ? "high" :
        "Error";

+    csrf_protection_mode = protections.getCsrfProtectionMode(_web_attack_mitigation_mode);
+    open_redirect_mode = protections.getOpenRedirectMode(_web_attack_mitigation_mode);
+    error_disclosure_mode = protections.getErrorDisclosureMode(_web_attack_mitigation_mode);
+
    triggers.push_back(TriggersInWaapSection(parsed_log_trigger));
    for (const SourcesIdentifiers &source_ident : parsed_trusted_sources.getSourcesIdentifiers()) {
        overrides.push_back(AppSecOverride(source_ident));
@@ -510,9 +519,9 @@ WebAppSection::save(cereal::JSONOutputArchive &out_ar) const
        cereal::make_nvp("webAttackMitigationAction",   web_attack_mitigation_action),
        cereal::make_nvp("webAttackMitigationMode",     web_attack_mitigation_mode),
        cereal::make_nvp("practiceAdvancedConfig",      practice_advanced_config),
-        cereal::make_nvp("csrfProtection",              disabled_str),
-        cereal::make_nvp("openRedirect",                disabled_str),
-        cereal::make_nvp("errorDisclosure",             disabled_str),
+        cereal::make_nvp("csrfProtection",              csrf_protection_mode),
+        cereal::make_nvp("openRedirect",                open_redirect_mode),
+        cereal::make_nvp("errorDisclosure",             error_disclosure_mode),
        cereal::make_nvp("practiceId",                  practice_id),
        cereal::make_nvp("practiceName",                practice_name),
        cereal::make_nvp("assetId",                     asset_id),
--- a/components/security_apps/local_policy_mgmt_gen/include/access_control_practice.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/access_control_practice.h
@@ -165,7 +165,7 @@ public:
    void load(cereal::JSONInputArchive &archive_in);

    const std::vector<AccessControlRateLimiteRules> & getRules() const;
-    const std::string & getMode() const;
+    const std::string & getMode(const std::string &default_mode = "inactive") const;
    std::vector<RateLimitRulesSection> createRateLimitRulesSection(const RateLimitRulesTriggerSection &trigger) const;

 private:
@@ -178,15 +178,17 @@ class AccessControlPracticeSpec
 public:
    void load(cereal::JSONInputArchive &archive_in);

-    const AccessControlRateLimit & geRateLimit() const;
+    const AccessControlRateLimit &getRateLimit() const;
    const std::string & getAppSecClassName() const;
    const std::string & getName() const;
+    const std::string & getMode(const std::string &default_mode = "inactive") const;
    void setName(const std::string &_name);

 private:
    AccessControlRateLimit      rate_limit;
    std::string                 appsec_class_name;
    std::string                 practice_name;
+    std::string                 mode;
 };

 #endif // __ACCESS_CONTROL_PRACTICE_H__
--- a/components/security_apps/local_policy_mgmt_gen/include/appsec_practice_section.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/appsec_practice_section.h
@@ -278,6 +278,7 @@ public:
        const std::vector<InnerException> &parsed_exceptions
    );

+    // used for V1beta2
    WebAppSection(
        const std::string &_application_urls,
        const std::string &_asset_id,
@@ -292,7 +293,8 @@ public:
        const PracticeAdvancedConfig &_practice_advanced_config,
        const AppsecPracticeAntiBotSection &_anti_bots,
        const LogTriggerSection &parsed_log_trigger,
-        const AppSecTrustedSources &parsed_trusted_sources);
+        const AppSecTrustedSources &parsed_trusted_sources,
+        const NewAppSecWebAttackProtections &protections);

    void save(cereal::JSONOutputArchive &out_ar) const;

@@ -310,6 +312,9 @@ private:
    std::string web_attack_mitigation_action;
    std::string web_attack_mitigation_severity;
    std::string web_attack_mitigation_mode;
+    std::string csrf_protection_mode;
+    std::string open_redirect_mode;
+    std::string error_disclosure_mode;
    bool web_attack_mitigation;
    std::vector<TriggersInWaapSection> triggers;
    PracticeAdvancedConfig practice_advanced_config;
--- a/components/security_apps/local_policy_mgmt_gen/include/ingress_data.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/ingress_data.h
@@ -79,6 +79,7 @@ class DefaultBackend
 {
 public:
    void load(cereal::JSONInputArchive &);
+    bool doesExist() const;

 private:
    bool is_exists = false;
@@ -90,6 +91,7 @@ public:
    void load(cereal::JSONInputArchive &archive_in);

    const std::vector<IngressDefinedRule> & getRules() const;
+    bool doesDefaultBackendExist() const;

 private:
    std::string ingress_class_name;
--- a/components/security_apps/local_policy_mgmt_gen/include/local_policy_common.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/local_policy_common.h
@@ -97,8 +97,7 @@ parseAppsecJSONKey(
        value = default_value;
        if (!mandatory) {
            dbgDebug(D_LOCAL_POLICY)
-                << "Could not parse the required key. Key: \""<< key_name
-                << "\", Error: " << e.what();
+                << "Could not parse a non-mandatory key: \""<< key_name << "\", Error: " << e.what();
        } else {
            throw PolicyGenException(
                "Could not parse a mandatory key: \"" + key_name + "\", Error: " + std::string(e.what())
--- a/components/security_apps/local_policy_mgmt_gen/include/new_log_trigger.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/new_log_trigger.h
@@ -129,7 +129,7 @@ public:
    bool shouldBeautifyLogs() const;

    bool getCloud() const;
-    bool isK8SNeeded() const;
+    bool isContainerNeeded() const;
    bool isCefNeeded() const;
    bool isSyslogNeeded() const;
    const std::string & getSyslogServerIpv4Address() const;
@@ -140,7 +140,7 @@ private:
    const NewLoggingService & getCefServiceData() const;

    bool cloud = false;
-    bool k8s_service = false;
+    bool container_service = false;
    bool agent_local = true;
    bool beautify_logs = true;
    NewLoggingService syslog_service;
--- a/components/security_apps/local_policy_mgmt_gen/include/new_practice.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/new_practice.h
@@ -24,6 +24,14 @@
 #include "debug.h"
 #include "local_policy_common.h"

+bool isModeInherited(const std::string &mode);
+
+const std::string &getModeWithDefault(
+    const std::string &mode,
+    const std::string &default_mode,
+    const std::unordered_map<std::string, std::string> &key_to_val
+);
+
 class IpsProtectionsRulesSection
 {
 public:
@@ -126,8 +134,8 @@ class NewIntrusionPrevention
 public:
    void load(cereal::JSONInputArchive &archive_in);

-    std::vector<IpsProtectionsRulesSection> createIpsRules() const;
-    const std::string & getMode() const;
+    std::vector<IpsProtectionsRulesSection> createIpsRules(const std::string &default_mode) const;
+    const std::string & getMode(const std::string &default_mode = "inactive") const;

 private:
    std::string override_mode;
@@ -273,7 +281,8 @@ public:
        const std::string &asset_name,
        const std::string &asset_id,
        const std::string &practice_name,
-        const std::string &practice_id
+        const std::string &practice_id,
+        const std::string &default_mode
    ) const;

 private:
@@ -486,7 +495,7 @@ public:
    void load(cereal::JSONInputArchive &archive_in);

    void addFile(const std::string &file_name);
-    const std::string & getOverrideMode() const;
+    const std::string & getOverrideMode(const std::string &default_mode = "inactive") const;
    const std::vector<std::string> & getConfigMap() const;
    const std::vector<std::string> & getFiles() const;
    bool isTemporary() const;
@@ -530,10 +539,10 @@ class NewAppSecWebAttackProtections
 public:
    void load(cereal::JSONInputArchive &archive_in);

-    const std::string getCsrfProtectionMode() const;
-    const std::string & getErrorDisclosureMode() const;
+    const std::string & getCsrfProtectionMode(const std::string &default_mode = "inactive") const;
+    const std::string & getErrorDisclosureMode(const std::string &default_mode = "inactive") const;
+    const std::string & getOpenRedirectMode(const std::string &default_mode = "inactive") const;
    bool getNonValidHttpMethods() const;
-    const std::string getOpenRedirectMode() const;

 private:
    std::string csrf_protection;
@@ -551,9 +560,9 @@ public:
    int getMaxHeaderSizeBytes() const;
    int getMaxObjectDepth() const;
    int getMaxUrlSizeBytes() const;
-    const std::string & getMinimumConfidence() const;
-    const NewAppSecWebAttackProtections & getprotections() const;
-    const std::string & getMode(const std::string &default_mode = "Inactive") const;
+    const std::string & getMinimumConfidence(const std::string &default_mode = "inactive") const;
+    const NewAppSecWebAttackProtections & getProtections() const;
+    const std::string & getMode(const std::string &default_mode = "inactive") const;

 private:
    int                             max_body_size_kb;
@@ -578,6 +587,7 @@ public:
    const NewFileSecurity & getFileSecurity() const;
    const std::string & getAppSecClassName() const;
    const std::string & getName() const;
+    const std::string & getMode(const std::string &default_mode = "inactive") const;
    void setName(const std::string &_name);

 private:
@@ -589,6 +599,7 @@ private:
    NewAppSecPracticeAntiBot                    anti_bot;
    std::string                                 appsec_class_name;
    std::string                                 practice_name;
+    std::string                                 mode;
 };

 #endif // __NEW_PRACTICE_H__
--- a/components/security_apps/local_policy_mgmt_gen/include/policy_maker_utils.h
+++ b/components/security_apps/local_policy_mgmt_gen/include/policy_maker_utils.h
@@ -111,7 +111,7 @@ private:
    SecurityAppsWrapper security_apps;
 };

-class PolicyMakerUtils
+class PolicyMakerUtils : Singleton::Consume<I_EnvDetails>
 {
 public:
    std::string proccesSingleAppsecPolicy(
@@ -158,7 +158,8 @@ private:
        const std::string &source_identifier,
        const std::string & context,
        const V1beta2AppsecLinuxPolicy &policy,
-        std::map<AnnotationTypes, std::string> &rule_annotations
+        std::map<AnnotationTypes, std::string> &rule_annotations,
+        const std::string &default_mode
    );

    void createSnortProtecionsSection(const std::string &file_name, bool is_temporary);
@@ -172,7 +173,8 @@ private:
        const std::string &practice_id,
        const std::string &source_identifier,
        const V1beta2AppsecLinuxPolicy &policy,
-        std::map<AnnotationTypes, std::string> &rule_annotations
+        std::map<AnnotationTypes, std::string> &rule_annotations,
+        const std::string &default_mode
    );

    void
@@ -183,7 +185,8 @@ private:
        const std::string &practice_name,
        const std::string & context,
        const V1beta2AppsecLinuxPolicy &policy,
-        std::map<AnnotationTypes, std::string> &rule_annotations
+        std::map<AnnotationTypes, std::string> &rule_annotations,
+        const std::string &default_mode
    );

    void
@@ -192,6 +195,7 @@ private:
        const std::string &url,
        const std::string &uri,
        const std::string &trigger_id,
+        const std::string &default_mode,
        const V1beta2AppsecLinuxPolicy &policy,
        std::map<AnnotationTypes, std::string> &rule_annotations
    );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ned Wright	110f0c8bd2	Aug 20th update	2024-08-21 08:42:14 +00:00
WrightNed	ca31aac08a	Merge pull request #174 from openappsec/orianelou-patch-6 Update docker-compose.yaml	2024-08-20 15:17:02 +03:00
orianelou	161b6dd180	Update docker-compose.yaml	2024-08-20 14:50:01 +03:00
WrightNed	84327e0b19	Merge pull request #170 from openappsec/orianelou-patch-4 Create docker-compose.yaml	2024-08-05 13:12:40 +03:00
orianelou	b9723ba6ce	Create docker-compose.yaml added compose for docker SWAG	2024-08-05 12:06:37 +03:00
WrightNed	00e183b8c6	Merge pull request #169 from openappsec/Jul_31_2024-Dev Jul 31st update	2024-08-01 18:10:44 +03:00
WrightNed	e859c167ed	Merge pull request #167 from openappsec/orianelou-crds Orianelou crds	2024-08-01 18:10:11 +03:00
Ned Wright	384b59cc87	Jul 31st update	2024-07-31 17:15:35 +00:00
orianelou	805e958cb9	Create open-appsec-crd-latest.yaml	2024-07-25 12:06:59 +03:00
orianelou	5bcd7cfcf1	Create open-appsec-crd-v1beta2.yaml	2024-07-25 12:05:57 +03:00
orianelou	ae6f2faeec	Create open-appsec-crd-v1beta1.yaml	2024-07-25 12:04:22 +03:00
WrightNed	705a5e6061	Merge pull request #166 from openappsec/Jul_23_2024-Dev Jul 23rd update	2024-07-24 16:01:45 +03:00
WrightNed	c33b74a970	Merge pull request #164 from chkp-omris/main update intelligence	2024-07-24 15:54:58 +03:00
chkp-omris	2da9fbc385	update intelligence	2024-07-23 13:15:33 +00:00
Ned Wright	f58e9a6128	Jul 23rd update	2024-07-23 11:08:24 +00:00
WrightNed	57ea5c72c5	Merge pull request #156 from openappsec/Jul_04_2024-Dev Jul 4th update	2024-07-07 08:47:38 +03:00
Ned Wright	962bd31d46	Jul 4th update	2024-07-04 14:10:34 +00:00
WrightNed	01770475ec	Merge pull request #153 from openappsec/Jun_26_2024-Dev June 27th update	2024-07-01 11:42:11 +03:00
Ned Wright	78b114a274	June 27th update	2024-06-27 12:05:38 +00:00
WrightNed	81b1aec487	Merge pull request #148 from openappsec/orianelou-new-policy-files Orianelou new policy files	2024-06-19 16:18:41 +03:00
orianelou	be6591a670	Update local_policy.yaml	2024-06-17 13:49:48 +03:00
orianelou	663782009c	Update local_policy.yaml	2024-06-17 13:49:18 +03:00
orianelou	9392bbb26c	Update local_policy.yaml	2024-06-17 13:49:01 +03:00
orianelou	46682bcdce	Update local_policy.yaml	2024-06-17 13:48:39 +03:00
orianelou	057bc42375	Update local_policy.yaml	2024-06-17 13:47:24 +03:00
orianelou	88e0ccd308	Rename open-appsec-k8s-default-config-v1beta21.yaml to open-appsec-k8s-default-config-v1beta1.yaml	2024-06-17 13:45:02 +03:00
orianelou	4241b9c574	Create open-appsec-k8s-prevent-config-v1beta2.yaml	2024-06-17 13:44:45 +03:00
orianelou	4af9f18ada	Create open-appsec-k8s-default-config-v1beta2.yaml	2024-06-17 13:44:25 +03:00
orianelou	3b533608b1	Create open-appsec-k8s-prevent-config-v1beta1.yaml	2024-06-17 13:42:13 +03:00
orianelou	74bb3086ec	Create open-appsec-k8s-default-config-v1beta21.yaml	2024-06-17 13:41:29 +03:00
orianelou	504d1415a5	Create local_policy.yaml	2024-06-17 13:39:40 +03:00
orianelou	18b1b63c42	Create local_policy.yaml	2024-06-17 13:38:31 +03:00
orianelou	ded2a5ffc2	Create local_policy.yaml	2024-06-17 13:36:23 +03:00
orianelou	1254bb37b2	Create local_policy.yaml	2024-06-17 13:34:35 +03:00
orianelou	cf16343caa	Create open-appsec-k8s-prevent-config-v1beta2.yaml	2024-06-16 10:56:16 +03:00
orianelou	78c4209406	Rename config/k8s/v1beta2/default/open-appsec-k8s-default-config-v1beta2.yaml to config/k8s/v1beta2/open-appsec-k8s-default-config-v1beta2.yaml	2024-06-16 10:55:23 +03:00
orianelou	3c8672c565	Rename config/k8s/v1beta2/open-appsec-k8s-default-config-v1beta2.yaml to config/k8s/v1beta2/default/open-appsec-k8s-default-config-v1beta2.yaml	2024-06-16 10:54:05 +03:00
orianelou	48d6baed3b	Rename config/linux/v1beta2/local_policy.yaml to config/linux/v1beta2/default/local_policy.yaml	2024-06-16 10:44:39 +03:00
orianelou	8770257a60	Create local_policy.yaml for linux prevent	2024-06-16 10:44:21 +03:00
Ned Wright	fd5d093b24	Add --no-upgrade option to docker	2024-06-03 14:19:41 +00:00
WrightNed	d6debf8d8d	Merge pull request #141 from openappsec/May_27_2024-Dev May 27 2024 dev	2024-06-02 10:15:10 +03:00
Ned Wright	395b754575	Add dammy get-cloud-metadata.sh script	2024-05-29 11:01:17 +00:00
Ned Wright	dc000372c4	Turn on optimization by default	2024-05-27 12:05:16 +00:00
Ned Wright	941c641174	Change cloud default logging	2024-05-27 11:56:05 +00:00
Ned Wright	fdc148aa9b	May 27 update	2024-05-27 09:05:33 +00:00
orianelou	307fd8897d	Rename config/k8s/open-appsec-k8s-default-config-v1beta2.yaml to config/k8s/v1beta2/open-appsec-k8s-default-config-v1beta2.yaml	2024-05-21 15:24:55 +03:00
orianelou	afd2b4930b	Create open-appsec-k8s-default-config-v1beta2.yaml	2024-05-21 15:24:33 +03:00
orianelou	1fb9a29223	Create local_policy.yaml	2024-05-21 15:22:54 +03:00
WrightNed	253ca70de6	Merge pull request #136 from chkp-omris/main Update agent-intelligence-service package	2024-05-19 15:30:22 +03:00
chkp-omris	938f625535	Merge branch 'openappsec:main' into main	2024-05-19 15:21:46 +03:00
chkp-omris	183d14fc55	Update agent-intelligence-service package	2024-05-19 12:21:10 +00:00
WrightNed	1f3d4ed5e1	Merge pull request #135 from openappsec/Apr_21_2024-Dev Apr 21 2024 dev	2024-05-19 11:08:26 +03:00
WrightNed	fdbd6d3786	Merge pull request #115 from openappsec/orianelou-patch-3 Update docker-compose.yaml	2024-05-19 11:07:22 +03:00
Ned Wright	4504138a4a	Change all deployments to embedded	2024-04-22 09:46:50 +00:00
Ned Wright	66ed4a8d81	April 21th 2024 update	2024-04-21 13:57:46 +00:00
WrightNed	189c9209c9	Merge pull request #122 from openappsec/Apr_14_2024-Dev Apr 14 2024 dev	2024-04-17 12:40:41 +03:00
Ned Wright	1a1580081c	Add watchdog changes	2024-04-16 14:06:43 +00:00
Ned Wright	942b2ef8b4	2024 April 14th update	2024-04-14 12:55:54 +00:00
Ned Wright	7a7f65a77a	Detect docker on http transaction installation	2024-04-14 11:28:53 +00:00
Ned Wright	98639d9cb6	configuration loading changes	2024-04-04 17:11:06 +00:00
Ned Wright	b3de81d9d9	Updating orchestration_package.sh	2024-03-31 08:48:55 +00:00
Ned Wright	a77fd9a6d0	Remove old data	2024-03-27 14:30:40 +00:00
Ned Wright	8454b2dd9b	Open Appsec helm chart automation Wed Mar 27 16:27:33 IST 2024 latest	2024-03-27 16:27:33 +02:00
Ned Wright	3913e1e8b3	Update entry.sh	2024-03-26 16:05:23 +00:00
WrightNed	262b2e59ff	Merge pull request #117 from openappsec/Mar_21_2024-Dev Mar 21 2024 dev	2024-03-26 13:53:49 +02:00
Ned Wright	a01c65994a	Edit components/security_apps/layer_7_access_control/layer_7_access_control.cc	2024-03-25 14:53:52 +00:00
WrightNed	1d13973ae2	Update entry.sh	2024-03-25 15:56:00 +02:00
Ned Wright	c20fa9f966	Mar 21st 2024 update	2024-03-21 15:31:38 +00:00
orianelou	ecbb34bc17	Update docker-compose.yaml changes comment type	2024-03-21 11:24:12 +02:00
WrightNed	0d22790ebe	Merge pull request #113 from openappsec/WrightNed-patch-1 Update orchestration_package.sh	2024-03-12 13:02:27 +02:00
WrightNed	9f86c4607e	Update orchestration_package.sh	2024-03-12 13:01:44 +02:00
WrightNed	0e47ed8595	Merge pull request #110 from openappsec/Feb_28_2024 Feb 28 2024	2024-03-10 15:23:57 +02:00
Ned Wright	42b0bf2981	Fix typo	2024-03-10 13:21:51 +00:00
Ned Wright	75b40933ec	Change default to log to cloud	2024-02-28 18:27:39 +00:00
Ned Wright	b795661328	Moving yq to be taken from environment	2024-02-28 15:04:14 +00:00
Ned Wright	eb509dfa85	Moving yq to be taken from environment	2024-02-28 14:09:18 +00:00
WrightNed	ec834aeafb	Merge pull request #106 from openappsec/orianelou-patch-apisix Orianelou patch apisix	2024-02-26 10:52:27 +02:00
orianelou	2c9ec1e48c	Delete apisix directory	2024-02-26 10:50:43 +02:00
orianelou	55b5973c15	Create docker-compose.yaml	2024-02-26 10:50:16 +02:00
orianelou	63b5a63ded	Create apisix-standalone.yaml	2024-02-26 10:49:23 +02:00
orianelou	b08047cc33	Create apisix-standalone.yaml:	2024-02-25 11:41:04 +02:00
orianelou	328808c15f	Create docker-compose.yaml	2024-02-25 11:40:12 +02:00
WrightNed	c255621cd6	Merge pull request #94 from bmbeverst/fix_tests Fix new helm-unittest tests	2024-02-22 14:24:37 +02:00
Brooks Beverstock	aa8cfd1b2a	fix: Set kind to Vanilla in ingress-nginx tests, so they pass.	2024-01-24 17:07:35 -05:00
Brooks Beverstock	5452d68f9b	fix: Rename expected test name due to chart name change, from `ingress-nginx` to `open-appsec-k8s-nginx-ingress`.	2024-01-24 17:06:53 -05:00