diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md
index 519729acbf..32542c3c8b 100644
--- a/bitnami/matomo/CHANGELOG.md
+++ b/bitnami/matomo/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 9.3.6 (2025-05-03)
+## 9.3.7 (2025-05-07)
 
-* [bitnami/matomo] Release 9.3.6 ([#33314](https://github.com/bitnami/charts/pull/33314))
+* [bitnami/matomo] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33396](https://github.com/bitnami/charts/pull/33396))
+
+## <small>9.3.6 (2025-05-03)</small>
+
+* [bitnami/matomo] Release 9.3.6 (#33314) ([5976be1](https://github.com/bitnami/charts/commit/5976be1ecb807f0fd3a13b8a889da4054d7c84bf)), closes [#33314](https://github.com/bitnami/charts/issues/33314)
 
 ## <small>9.3.5 (2025-05-03)</small>
 
diff --git a/bitnami/matomo/Chart.lock b/bitnami/matomo/Chart.lock
index 9da7bbaf7e..b115e63a3a 100644
--- a/bitnami/matomo/Chart.lock
+++ b/bitnami/matomo/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 20.5.3
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.30.2
-digest: sha256:8760b38f9007a64fed5f7bda8c18981abc05f3ab65e1b3cfd692a7277b04dd50
-generated: "2025-05-03T06:16:19.820464572Z"
+  version: 2.31.0
+digest: sha256:b1d1ae0a4554cfeb0f6e1de395261910a0ba101a11ce4566e209e801dc3783b9
+generated: "2025-05-06T10:36:24.266497431+02:00"
diff --git a/bitnami/matomo/Chart.yaml b/bitnami/matomo/Chart.yaml
index a2478904f9..bef01025c7 100644
--- a/bitnami/matomo/Chart.yaml
+++ b/bitnami/matomo/Chart.yaml
@@ -40,4 +40,4 @@ maintainers:
 name: matomo
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/matomo
-version: 9.3.6
+version: 9.3.7
diff --git a/bitnami/matomo/templates/ingress.yaml b/bitnami/matomo/templates/ingress.yaml
index e5d64092d1..136ee6da8c 100644
--- a/bitnami/matomo/templates/ingress.yaml
+++ b/bitnami/matomo/templates/ingress.yaml
@@ -15,7 +15,7 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
+  {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
@@ -27,9 +27,7 @@ spec:
           {{- toYaml .Values.ingress.extraPaths | nindent 10 }}
           {{- end }}
           - path: {{ .Values.ingress.path }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
-            {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
@@ -37,9 +35,7 @@ spec:
       http:
         paths:
           - path: {{ default "/" .path }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}