diff --git a/bitnami/phpmyadmin/CHANGELOG.md b/bitnami/phpmyadmin/CHANGELOG.md
index 30f48fb635..be5d06ae82 100644
--- a/bitnami/phpmyadmin/CHANGELOG.md
+++ b/bitnami/phpmyadmin/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 18.1.6 (2025-04-22)
+## 18.1.7 (2025-05-06)
 
-* [bitnami/phpmyadmin] Release 18.1.6 ([#33105](https://github.com/bitnami/charts/pull/33105))
+* [bitnami/phpmyadmin] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33420](https://github.com/bitnami/charts/pull/33420))
+
+## <small>18.1.6 (2025-04-22)</small>
+
+* [bitnami/phpmyadmin] Release 18.1.6 (#33105) ([49fb6e8](https://github.com/bitnami/charts/commit/49fb6e8fb842f28432f366965a2f0862be0c1907)), closes [#33105](https://github.com/bitnami/charts/issues/33105)
 
 ## <small>18.1.5 (2025-03-23)</small>
 
diff --git a/bitnami/phpmyadmin/Chart.lock b/bitnami/phpmyadmin/Chart.lock
index f15d225413..fb17b7e263 100644
--- a/bitnami/phpmyadmin/Chart.lock
+++ b/bitnami/phpmyadmin/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: mariadb
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 20.4.3
+  version: 20.5.3
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.30.0
-digest: sha256:2179a3011d384e207a9c028a947aebc1fe2d373e7d9eee3bc7376b2ddcf414bb
-generated: "2025-04-22T10:07:55.436701488Z"
+  version: 2.31.0
+digest: sha256:11591f475d38ae8f27e33de657043b2bdf659d6b23298f41dc929e0de73660ef
+generated: "2025-05-06T10:53:37.374075649+02:00"
diff --git a/bitnami/phpmyadmin/Chart.yaml b/bitnami/phpmyadmin/Chart.yaml
index a261bb9ef1..714b3b6d10 100644
--- a/bitnami/phpmyadmin/Chart.yaml
+++ b/bitnami/phpmyadmin/Chart.yaml
@@ -37,4 +37,4 @@ maintainers:
 name: phpmyadmin
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/phpmyadmin
-version: 18.1.6
+version: 18.1.7
diff --git a/bitnami/phpmyadmin/templates/ingress.yaml b/bitnami/phpmyadmin/templates/ingress.yaml
index 278b7e9851..8e82b9c012 100644
--- a/bitnami/phpmyadmin/templates/ingress.yaml
+++ b/bitnami/phpmyadmin/templates/ingress.yaml
@@ -21,7 +21,7 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
+  {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
@@ -33,9 +33,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 }}
@@ -43,9 +41,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 }}