diff --git a/charts/octopod/Chart.yaml b/charts/octopod/Chart.yaml
index deb29de..39c6e80 100644
--- a/charts/octopod/Chart.yaml
+++ b/charts/octopod/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: octopod
 description: An opensource self-hosted solution for managing multiple deployments in a Kubernetes cluster.
 type: application
-version: 0.6.9
+version: 0.6.10
 appVersion: 1.5.2
 keywords:
   - kubernetes
diff --git a/charts/octopod/index.yaml b/charts/octopod/index.yaml
new file mode 100644
index 0000000..6dab696
--- /dev/null
+++ b/charts/octopod/index.yaml
@@ -0,0 +1,37 @@
+apiVersion: v1
+entries:
+  postgresql:
+  - annotations:
+      category: Database
+    apiVersion: v2
+    appVersion: 11.12.0
+    created: "2022-08-23T14:43:53.959078+03:00"
+    dependencies:
+    - name: common
+      repository: https://charts.bitnami.com/bitnami
+      version: 1.x.x
+    description: Chart for PostgreSQL, an object-relational database management system
+      (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+    digest: afece60469d73b9cc4b578fff9b7627dd6ae609be50a04dabac5ad0be5105f33
+    home: https://github.com/bitnami/charts/tree/master/bitnami/postgresql
+    icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-220x234.png
+    keywords:
+    - postgresql
+    - postgres
+    - database
+    - sql
+    - replication
+    - cluster
+    maintainers:
+    - email: containers@bitnami.com
+      name: Bitnami
+    - email: cedric@desaintmartin.fr
+      name: desaintmartin
+    name: postgresql
+    sources:
+    - https://github.com/bitnami/bitnami-docker-postgresql
+    - https://www.postgresql.org/
+    urls:
+    - charts/postgresql-10.5.3.tgz
+    version: 10.5.3
+generated: "2022-08-23T14:43:53.955624+03:00"
diff --git a/charts/octopod/templates/ingress-app.yaml b/charts/octopod/templates/ingress-app.yaml
index ee2df33..3eb25b5 100644
--- a/charts/octopod/templates/ingress-app.yaml
+++ b/charts/octopod/templates/ingress-app.yaml
@@ -1,10 +1,13 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "octopod.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version }}
+{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
+apiVersion: networking.k8s.io/v1
+{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{ else }}
 apiVersion: extensions/v1beta1
-{{- end }}
+{{ end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}-app
@@ -42,6 +45,8 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ .Values.service.ports.app }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ .Values.service.ports.app }}
 {{- end }}
diff --git a/charts/octopod/templates/ingress-powerapp.yaml b/charts/octopod/templates/ingress-powerapp.yaml
index ef679be..bf36e2d 100644
--- a/charts/octopod/templates/ingress-powerapp.yaml
+++ b/charts/octopod/templates/ingress-powerapp.yaml
@@ -1,10 +1,13 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "octopod.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version }}
+{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
+apiVersion: networking.k8s.io/v1
+{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{ else }}
 apiVersion: extensions/v1beta1
-{{- end }}
+{{ end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}-powerapp
@@ -36,6 +39,8 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ .Values.service.ports.powerApp }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ .Values.service.ports.powerApp }}
 {{- end }}
diff --git a/charts/octopod/templates/ingress-ui.yaml b/charts/octopod/templates/ingress-ui.yaml
index d0fb497..8673cda 100644
--- a/charts/octopod/templates/ingress-ui.yaml
+++ b/charts/octopod/templates/ingress-ui.yaml
@@ -1,10 +1,13 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "octopod.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version }}
+{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
+apiVersion: networking.k8s.io/v1
+{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{ else }}
 apiVersion: extensions/v1beta1
-{{- end }}
+{{ end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}-ui
@@ -36,6 +39,8 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ .Values.service.ports.ui }}
+              service:
+                name: {{ $fullName }}
+                port: 
+                  number: {{ .Values.service.ports.ui }}
 {{- end }}
diff --git a/charts/octopod/templates/ingress-ws.yaml b/charts/octopod/templates/ingress-ws.yaml
index ad3be0d..3a4a887 100644
--- a/charts/octopod/templates/ingress-ws.yaml
+++ b/charts/octopod/templates/ingress-ws.yaml
@@ -1,10 +1,13 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "octopod.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeVersion := .Capabilities.KubeVersion.Version }}
+{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
+apiVersion: networking.k8s.io/v1
+{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
+{{ else }}
 apiVersion: extensions/v1beta1
-{{- end }}
+{{ end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}-ws
@@ -36,6 +39,8 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ .Values.service.ports.ws }}
+              service:
+                name: {{ $fullName }}
+                port: 
+                  number: {{ .Values.service.ports.ws }}
 {{- end }}