diff --git a/charts/airflow/CHANGELOG.md b/charts/airflow/CHANGELOG.md
index 7c59ff56..9f89432a 100644
--- a/charts/airflow/CHANGELOG.md
+++ b/charts/airflow/CHANGELOG.md
@@ -8,6 +8,46 @@ This project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
 TBD
 
+## [8.7.0] - 2023-04-06
+
+> 🟥 __WARNINGS__ 🟥
+>
+> - if you use a custom `pgbouncer.image.tag`, you MUST update it to `1.18.0-patch.1` or later, as we now require the `openssl` package to be installed for generating self-signed certificates
+> - if you use a custom `postgresql.image`, please take note that `postgresql.image.registry` is now `ghcr.io` by default (rather than `docker.io`)
+> - if you use "Azure File" for logs persistence, you MUST NOT update to airflow 2.5.1, 2.5.2, or 2.5.3:
+>    - there is an [issue in these versions](https://github.com/apache/airflow/issues/29112) that will cause your tasks to fail
+>    - if you wish to use these versions, you will need to use a different method of logs persistence, for example [the `Azure Blob Storage` remote provider](https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/monitoring/log-persistence.md#option-2---remote-providers)
+
+> 🟨 __NOTES__ 🟨
+>
+> - the default airflow image is now `apache/airflow:2.5.3-python3.8`, but you can still use any supported version of airflow, see the [airflow version support matrix](https://github.com/airflow-helm/charts/tree/main/charts/airflow#airflow-version-support)
+> - when upgrading to airflow 2.5, you may wish to rename your kubernetes `aiflow.config` from `AIRFLOW__KUBERNETES__*` to `AIRFLOW__KUBERNETES_EXECUTOR__*`, as the former was deprecated by airflow 2.5
+> - the chart should no longer be forever "out of sync" in apps like ArgoCD, as this issue was resolved by [#718](https://github.com/airflow-helm/charts/pull/718)
+
+> 🟦 __OTHER__ 🟦
+>
+> - If you appreciate the `User-Community Airflow Helm Chart` please consider supporting us!
+>    - [give a ⭐ on GitHub](https://github.com/airflow-helm/charts/stargazers)
+>    - [give a ⭐ on ArtifactHub](https://artifacthub.io/packages/helm/airflow-helm/airflow)
+
+### Changed
+- the default airflow image is now `apache/airflow:2.5.3-python3.8` (see the [airflow version support matrix](https://github.com/airflow-helm/charts/tree/main/charts/airflow#airflow-version-support))
+- the default git-sync image is now `registry.k8s.io/git-sync/git-sync:v3.6.5`
+- the default pgbouncer image is now `ghcr.io/airflow-helm/pgbouncer:1.18.0-patch.1`
+- the default embedded postgres image is now `ghcr.io/airflow-helm/postgresql-bitnami:11.16-patch.0` (our new [custom image](https://github.com/airflow-helm/charts/tree/main/images/postgresql-bitnami/11/alpine), with support for ARM64)
+- the default embedded redis image is now `bitnami/redis:5.0.14-debian-10-r173`
+- we now generate self-signed certificates for pgbouncer using a startup script, fixing ArgoCD being forever "out of sync" ([#718](https://github.com/airflow-helm/charts/pull/718))
+
+### Added
+- feature for automatically changing pool slots on cron schedules ([#649](https://github.com/airflow-helm/charts/pull/649))
+- ability to disable chart-managed `webserver_config.py` file with `web.webserverConfig.enabled` value ([#631](https://github.com/airflow-helm/charts/pull/631))
+- added `dags.gitSync.submodules` value ([#620](https://github.com/airflow-helm/charts/pull/620))
+
+### Fixed
+- ensure Kubernetes 1.25+ support by updating default api versions for `PodDisruptionBudget` and `HorizontalPodAutoscaler` ([#685](https://github.com/airflow-helm/charts/pull/685))
+- now also set `kubernetes_executor` airflow configs, as `kubernetes` ones are deprecated ([#719](https://github.com/airflow-helm/charts/pull/719))
+- fix typo in error message ([#696](https://github.com/airflow-helm/charts/pull/696))
+
 ## [8.6.1] - 2022-06-22
 
 > 🟥 __WARNINGS__ 🟥
@@ -31,21 +71,15 @@ TBD
 >    - [`bitnami/postgresql`](https://hub.docker.com/r/bitnami/postgresql/) → [`ghcr.io/airflow-helm/postgresql-bitnami`](https://ghcr.io/airflow-helm/postgresql-bitnami)
 >    - [`bitnami/redis`](https://hub.docker.com/r/bitnami/redis/) → `TBA`
 
-> 🟦 __OTHER__ 🟦
->
-> - If you appreciate the `User-Community Airflow Helm Chart` please consider supporting us!
->    - [give a ⭐ on GitHub](https://github.com/airflow-helm/charts/stargazers)
->    - [give a ⭐ on ArtifactHub](https://artifacthub.io/packages/helm/airflow-helm/airflow)
+### Changed
+- update `.helmignore` file to exclude docs ([#593](https://github.com/airflow-helm/charts/pull/593))
+- require release-name to have <= 40 characters ([#589](https://github.com/airflow-helm/charts/pull/589))
 
 ### Added
 - add `airflow.protectedPipPackages` ([#610](https://github.com/airflow-helm/charts/pull/610))
 - allow using `extraVolumeMounts` for log storage ([#585](https://github.com/airflow-helm/charts/pull/585))
 - minimum scheduler age before task-creation-check ([#612](https://github.com/airflow-helm/charts/pull/612))
 
-### Changed
-- update `.helmignore` file to exclude docs ([#593](https://github.com/airflow-helm/charts/pull/593))
-- require release-name to have <= 40 characters ([#589](https://github.com/airflow-helm/charts/pull/589))
-
 ### Fixed
 - fix some breaking changes from airflow 2.3.0 ([#592](https://github.com/airflow-helm/charts/pull/592)) 
 - fix wait-for-db-migrations in airflow 2.3.0 ([#576](https://github.com/airflow-helm/charts/pull/576)) 
@@ -75,6 +109,13 @@ TBD
 > - The new [PgBouncer startupProbe](https://github.com/airflow-helm/charts/pull/547) will only work in Kubernetes 1.18+
 > - The [`extraManifests` value](docs/faq/kubernetes/extra-manifests.md) has been significantly improved
 
+### Changed
+- the default `airflow.image` is now `apache/airflow:2.2.5-python3.8` (see the [airflow version support matrix](https://github.com/airflow-helm/charts/tree/main/charts/airflow#airflow-version-support))
+- support helm templating in `extraManifests` by allowing string elements ([docs](docs/faq/kubernetes/extra-manifests.md)) ([#523](https://github.com/airflow-helm/charts/pull/523))
+- update default `dags.gitSync.image.tag` to `v3.5.0` ([#544](https://github.com/airflow-helm/charts/pull/544))
+- update default `pgbouncer.image.tag` to `1.17.0-patch.0` ([#552](https://github.com/airflow-helm/charts/pull/552))
+- update default `pgbouncer.maxClientConnections` to `1000` ([#543](https://github.com/airflow-helm/charts/pull/543))
+
 ### Added
 - add "airflow triggerer" Deployment ([#555](https://github.com/airflow-helm/charts/pull/555))
 - add "log-cleanup sidecar" to scheduler and worker ([docs](docs/faq/monitoring/log-cleanup.md)) ([#554](https://github.com/airflow-helm/charts/pull/554))
@@ -90,13 +131,6 @@ TBD
 - add `airflow.kubernetesPodTemplate.shareProcessNamespace` value ([#408](https://github.com/airflow-helm/charts/pull/408))
 - add `airflow.kubernetesPodTemplate.podLabels` value ([#534](https://github.com/airflow-helm/charts/pull/534))
 
-### Changed
-- the default `airflow.image` is now `apache/airflow:2.2.5-python3.8` (see the [airflow version support matrix](https://github.com/airflow-helm/charts/tree/main/charts/airflow#airflow-version-support))
-- support helm templating in `extraManifests` by allowing string elements ([docs](docs/faq/kubernetes/extra-manifests.md)) ([#523](https://github.com/airflow-helm/charts/pull/523))
-- update default `dags.gitSync.image.tag` to `v3.5.0` ([#544](https://github.com/airflow-helm/charts/pull/544))
-- update default `pgbouncer.image.tag` to `1.17.0-patch.0` ([#552](https://github.com/airflow-helm/charts/pull/552))
-- update default `pgbouncer.maxClientConnections` to `1000` ([#543](https://github.com/airflow-helm/charts/pull/543))
-
 ### Fixed
 - fix `airflow.{fernetKey,webserverSecretKey}` overshadowing `_CMD` and `_SECRET` configs ([docs-1](docs/faq/security/set-fernet-key.md), [docs-2](docs/faq/security/set-webserver-secret-key.md)) ([#508](https://github.com/airflow-helm/charts/pull/508))
 - fix PG_ADVISORY_LOCK not being released when using pgbouncer ([#529](https://github.com/airflow-helm/charts/pull/529))
@@ -154,14 +188,6 @@ TBD
 > - To revert to using a post-install Job for `db-migrations`, set `airflow.dbMigrations.runAsJob` to `true`
 > - The new default of `airflow.defaultSecurityContext = {fsGroup: 0}` should prevent filesystem permission errors in mounted volumes
 
-### Added
-- PgBouncer is now supported (and enabled by default), see the new `pgbouncer.*` values ([#341](https://github.com/airflow-helm/charts/pull/341), [#330](https://github.com/airflow-helm/charts/pull/330))
-- created a new Deployment called `db-migrations` to manage airflow database schema upgrades ([#345](https://github.com/airflow-helm/charts/pull/345))
-- added the `airflow.webserverSecretKey` value with default `"THIS IS UNSAFE!"` ([#346](https://github.com/airflow-helm/charts/pull/346))
-- added the `airflow.defaultSecurityContext` value with default `{fsGroup: 0}` ([#367](https://github.com/airflow-helm/charts/pull/367))
-- added `airflow.{defaultNodeSelector,defaultAffinity,defaultTolerations}` values ([#372](https://github.com/airflow-helm/charts/pull/372))
-- added `airflow.localSettings.*` values to make specifying `airflow_local_settings.py` easier ([#374](https://github.com/airflow-helm/charts/pull/374))
-
 ### Changed
 - the default `airflow.image` is now `apache/airflow:2.1.2-python3.8` (see the [airflow version support matrix](https://github.com/airflow-helm/charts/tree/main/charts/airflow#airflow-version-support))
 - the default `airflow.image.gid` is now `0` ([#388](https://github.com/airflow-helm/charts/pull/388))
@@ -175,6 +201,14 @@ TBD
 - the KubernetesExecutor pod-template now respects the `airflow.image.*` values ([#352](https://github.com/airflow-helm/charts/pull/352))
 - added values validation for `externalDatabase.type` ([#348](https://github.com/airflow-helm/charts/pull/348))
 
+### Added
+- PgBouncer is now supported (and enabled by default), see the new `pgbouncer.*` values ([#341](https://github.com/airflow-helm/charts/pull/341), [#330](https://github.com/airflow-helm/charts/pull/330))
+- created a new Deployment called `db-migrations` to manage airflow database schema upgrades ([#345](https://github.com/airflow-helm/charts/pull/345))
+- added the `airflow.webserverSecretKey` value with default `"THIS IS UNSAFE!"` ([#346](https://github.com/airflow-helm/charts/pull/346))
+- added the `airflow.defaultSecurityContext` value with default `{fsGroup: 0}` ([#367](https://github.com/airflow-helm/charts/pull/367))
+- added `airflow.{defaultNodeSelector,defaultAffinity,defaultTolerations}` values ([#372](https://github.com/airflow-helm/charts/pull/372))
+- added `airflow.localSettings.*` values to make specifying `airflow_local_settings.py` easier ([#374](https://github.com/airflow-helm/charts/pull/374))
+
 ### Fixed
 - fixed the scheduler livenessProbe command ([#351](https://github.com/airflow-helm/charts/pull/351))
 - made the sync-users deployment close its db connection after each loop ([#320](https://github.com/airflow-helm/charts/pull/320))
@@ -210,10 +244,6 @@ TBD
 >    - [How to manage airflow variables?](docs/faq/dags/airflow-variables.md)
 >    - [How to manage airflow pools?](docs/faq/dags/airflow-pools.md)
 
-### Added
-- allow referencing Secrets/ConfigMaps in `airflow.{users,connections,pools,variables}` ([#281](https://github.com/airflow-helm/charts/pull/281))
-- removed the need for `helmWait` value ([#266](https://github.com/airflow-helm/charts/pull/266))
-
 ### Changed
 - the default `airflow.image` is now `apache/airflow:2.1.1-python3.8` (see the [airflow version support matrix](https://github.com/airflow-helm/charts/tree/main/charts/airflow#airflow-version-support)) ([#286](https://github.com/airflow-helm/charts/issues/286))
 - the `Chart.yaml` now explicitly specifies `apiVersion=v2` (requiring helm 3) ([#278](https://github.com/airflow-helm/charts/issues/278))
@@ -222,6 +252,10 @@ TBD
 - `wait-for-db-migrations` init-containers now work properly when `airflow.legacyCommands=true` ([#271](https://github.com/airflow-helm/charts/pull/271))
 - improve validation of `{logs,dags}.persistence.accessMode` ([#269](https://github.com/airflow-helm/charts/pull/269))
 
+### Added
+- allow referencing Secrets/ConfigMaps in `airflow.{users,connections,pools,variables}` ([#281](https://github.com/airflow-helm/charts/pull/281))
+- removed the need for `helmWait` value ([#266](https://github.com/airflow-helm/charts/pull/266))
+
 ### Fixed
 - include volumeMounts in init-containers ([#255](https://github.com/airflow-helm/charts/pull/255))
 - add `release` to worker Service selector ([#267](https://github.com/airflow-helm/charts/pull/267))
@@ -721,7 +755,8 @@ TBD
 >
 > - To read about versions `7.0.0` and before, please see the [legacy repo](https://github.com/helm/charts/tree/master/stable/airflow).
 
-[Unreleased]: https://github.com/airflow-helm/charts/compare/airflow-8.6.1...HEAD
+[Unreleased]: https://github.com/airflow-helm/charts/compare/airflow-8.7.0...HEAD
+[8.7.0]: https://github.com/airflow-helm/charts/compare/airflow-8.6.1...airflow-8.7.0
 [8.6.1]: https://github.com/airflow-helm/charts/compare/airflow-8.6.0...airflow-8.6.1
 [8.6.0]: https://github.com/airflow-helm/charts/compare/airflow-8.5.3...airflow-8.6.0
 [8.5.3]: https://github.com/airflow-helm/charts/compare/airflow-8.5.2...airflow-8.5.3
diff --git a/charts/airflow/Chart.yaml b/charts/airflow/Chart.yaml
index ec5329dc..2a9cfc72 100644
--- a/charts/airflow/Chart.yaml
+++ b/charts/airflow/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Airflow Helm Chart (User Community) - the standard way to deploy Apache Airflow on Kubernetes with Helm
 name: airflow
-version: 8.6.1
-appVersion: 2.2.5
+version: 8.7.0
+appVersion: 2.5.3
 icon: https://airflow.apache.org/_images/pin_large.png
 home: https://github.com/airflow-helm/charts/tree/main/charts/airflow
 maintainers:
diff --git a/charts/airflow/README.md b/charts/airflow/README.md
index 5cb75773..7648d82c 100644
--- a/charts/airflow/README.md
+++ b/charts/airflow/README.md
@@ -1,14 +1,14 @@
-<h1 align="center">Airflow Helm Chart (User Community)</h1>
+# Airflow Helm Chart (User Community)
 
 <br>
 
-<p align="center">
-  The <code>User-Community Airflow Helm Chart</code> is the standard way to deploy <a href="https://airflow.apache.org/">Apache Airflow</a> on <a href="https://kubernetes.io/">Kubernetes</a> with <a href="https://helm.sh/">Helm</a>.
-  <br>
-  Originally created in 2018, it has since helped thousands of companies create production-ready deployments of Airflow on Kubernetes.
-</p>
+The `User-Community Airflow Helm Chart` is the standard way to deploy [Apache Airflow](https://airflow.apache.org/) on [Kubernetes](https://kubernetes.io/) with [Helm](https://helm.sh/).
+<br>
+Originally created in 2018, it has since helped thousands of companies create production-ready deployments of Airflow on Kubernetes.
+
+<br>
 
-<p align="center">
+<p>
   <a href="https://github.com/airflow-helm/charts/releases">
     <img alt="Downloads" src="https://img.shields.io/github/downloads/airflow-helm/charts/total?style=flat-square&color=28a745">
   </a>
@@ -26,7 +26,7 @@
   </a>
 </p>
 
-<p align="center">
+<p>
   <a href="https://github.com/airflow-helm/charts/stargazers">
     <img alt="GitHub Stars" src="https://img.shields.io/github/stars/airflow-helm/charts?style=for-the-badge&color=ffcb2f&label=Support%20with%20%E2%AD%90%20on%20GitHub">
   </a>
@@ -35,7 +35,7 @@
   </a>
 </p>
 
-<p align="center">
+<p>
   <a href="https://github.com/airflow-helm/charts/discussions">
     <img alt="GitHub Discussions" src="https://img.shields.io/github/discussions/airflow-helm/charts?style=for-the-badge&color=17a2b8&label=Start%20a%20Discussion">
   </a>
@@ -61,7 +61,7 @@ and was previously known as `stable/airflow` when it was developed in the `helm/
 ## Key Features
 
 - __Support for Airflow Versions:__ 
-   - [`1.10` | `2.0` | `2.1` | `2.2` | `2.3` | `2.4`](#airflow-version-support)
+   - [`1.10` | `2.0` | `2.1` | `2.2` | `2.3` | `2.4` | `2.5`](#airflow-version-support)
 - __Support for Airflow Executors:__ 
    - [`CeleryExecutor` | `KubernetesExecutor` | `CeleryKubernetesExecutor`](#airflow-executor-support)
 - __Easily Connect with your Database:__
@@ -159,6 +159,7 @@ Chart Version → <br> Airflow Version ↓  | `7.0.0` - `7.16.0` | `8.0.0` - `8.
 `2.2.X` | ❌ | ⚠️ <sub>[2]</sub> | ✔️️ | ✔️
 `2.3.X` | ❌ | ❌ | ❌ | ✔️️
 `2.4.X` | ❌ | ❌ | ❌ | ✔️️
+`2.5.X` | ❌ | ❌ | ❌ | ✔️️
 
 <sub>[1] you must set `airflow.legacyCommands = true` when using airflow version `1.10.X`</sub><br>
 <sub>[2] the [Deferrable Operators & Triggers](https://airflow.apache.org/docs/apache-airflow/stable/concepts/deferring.html) feature won't work, as there is no `airflow triggerer` Deployment</sub>
@@ -457,6 +458,7 @@ Parameter | Description | Default
 Parameter | Description | Default
 --- | --- | ---
 `postgresql.enabled` | if the `stable/postgresql` chart is used | `true`
+`postgresql.image.*` | configs for the postgres container image | `<see values.yaml>`
 `postgresql.postgresqlDatabase` | the postgres database to use | `airflow`
 `postgresql.postgresqlUsername` | the postgres user to create | `postgres`
 `postgresql.postgresqlPassword` | the postgres user's password | `airflow`
@@ -492,6 +494,7 @@ Parameter | Description | Default
 Parameter | Description | Default
 --- | --- | ---
 `redis.enabled` | if the `stable/redis` chart is used | `true`
+`redis.image.*` | configs for the redis container image | `<see values.yaml>`
 `redis.password` | the redis password | `airflow`
 `redis.existingSecret` | the name of a pre-created secret containing the redis password | `""`
 `redis.existingSecretPasswordKey` | the key within `redis.existingSecret` containing the password string | `redis-password`
diff --git a/charts/airflow/docs/faq/configuration/airflow-plugins.md b/charts/airflow/docs/faq/configuration/airflow-plugins.md
index f01e15dc..d859b0d4 100644
--- a/charts/airflow/docs/faq/configuration/airflow-plugins.md
+++ b/charts/airflow/docs/faq/configuration/airflow-plugins.md
@@ -23,10 +23,10 @@ You may embed your [Airflow Plugins](https://airflow.apache.org/docs/apache-airf
 
 This chart uses the official [`apache/airflow`](https://hub.docker.com/r/apache/airflow) Docker images.
 
-Here is a Dockerfile that extends `apache/airflow:2.2.5-python3.8` with custom plugins:
+Here is a Dockerfile that extends `apache/airflow:2.5.3-python3.8` with custom plugins:
 
 ```dockerfile
-FROM apache/airflow:2.2.5-python3.8
+FROM apache/airflow:2.5.3-python3.8
 
 # plugin files can be copied under `/home/airflow/plugins`
 # (where `./plugins` is relative to the docker build context)
diff --git a/charts/airflow/docs/faq/configuration/extra-python-packages.md b/charts/airflow/docs/faq/configuration/extra-python-packages.md
index c9a08944..debea781 100644
--- a/charts/airflow/docs/faq/configuration/extra-python-packages.md
+++ b/charts/airflow/docs/faq/configuration/extra-python-packages.md
@@ -192,10 +192,10 @@ You may embed your python packages directly into the container image.
 
 This chart uses the official [`apache/airflow`](https://hub.docker.com/r/apache/airflow) Docker images.
 
-Here is a Dockerfile that extends `apache/airflow:2.2.5-python3.8` with the `torch` package:
+Here is a Dockerfile that extends `apache/airflow:2.5.3-python3.8` with the `torch` package:
 
 ```dockerfile
-FROM apache/airflow:2.2.5-python3.8
+FROM apache/airflow:2.5.3-python3.8
 
 # install your pip packages
 RUN pip install --no-cache-dir \
diff --git a/charts/airflow/docs/faq/dags/load-dag-definitions.md b/charts/airflow/docs/faq/dags/load-dag-definitions.md
index 42cab1a4..95005f56 100644
--- a/charts/airflow/docs/faq/dags/load-dag-definitions.md
+++ b/charts/airflow/docs/faq/dags/load-dag-definitions.md
@@ -249,10 +249,10 @@ You may embed your DAG files directly into the container image.
 
 This chart uses the official [`apache/airflow`](https://hub.docker.com/r/apache/airflow) Docker images.
 
-Here is a Dockerfile that extends `apache/airflow:2.2.5-python3.8` by placing DAG files into `/opt/airflow/dags`:
+Here is a Dockerfile that extends `apache/airflow:2.5.3-python3.8` by placing DAG files into `/opt/airflow/dags`:
 
 ```dockerfile
-FROM apache/airflow:2.2.5-python3.8
+FROM apache/airflow:2.5.3-python3.8
 
 ## copy the content of local folder `./my_dag_folder` into container folder `/opt/airflow/dags`
 COPY ./my_dag_folder /opt/airflow/dags
diff --git a/charts/airflow/examples/google-gke/custom-values.yaml b/charts/airflow/examples/google-gke/custom-values.yaml
index 91e807f3..369e13d6 100644
--- a/charts/airflow/examples/google-gke/custom-values.yaml
+++ b/charts/airflow/examples/google-gke/custom-values.yaml
@@ -9,7 +9,7 @@ airflow:
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/configuration/airflow-version.md
   image:
     repository: apache/airflow
-    tag: 2.2.5-python3.8
+    tag: 2.5.3-python3.8
 
   ## the airflow executor type to use
   executor: CeleryExecutor
diff --git a/charts/airflow/examples/minikube/custom-values.yaml b/charts/airflow/examples/minikube/custom-values.yaml
index eed78ef8..44a7b686 100644
--- a/charts/airflow/examples/minikube/custom-values.yaml
+++ b/charts/airflow/examples/minikube/custom-values.yaml
@@ -9,7 +9,7 @@ airflow:
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/configuration/airflow-version.md
   image:
     repository: apache/airflow
-    tag: 2.2.5-python3.8
+    tag: 2.5.3-python3.8
 
   ## the airflow executor type to use
   executor: CeleryExecutor
diff --git a/charts/airflow/sample-values-CeleryExecutor.yaml b/charts/airflow/sample-values-CeleryExecutor.yaml
index 020f3479..ee3c353a 100644
--- a/charts/airflow/sample-values-CeleryExecutor.yaml
+++ b/charts/airflow/sample-values-CeleryExecutor.yaml
@@ -9,7 +9,7 @@ airflow:
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/configuration/airflow-version.md
   image:
     repository: apache/airflow
-    tag: 2.2.5-python3.8
+    tag: 2.5.3-python3.8
 
   ## the airflow executor type to use
   executor: CeleryExecutor
diff --git a/charts/airflow/sample-values-CeleryKubernetesExecutor.yaml b/charts/airflow/sample-values-CeleryKubernetesExecutor.yaml
index 71cc193b..e2ba1aa1 100644
--- a/charts/airflow/sample-values-CeleryKubernetesExecutor.yaml
+++ b/charts/airflow/sample-values-CeleryKubernetesExecutor.yaml
@@ -9,7 +9,7 @@ airflow:
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/configuration/airflow-version.md
   image:
     repository: apache/airflow
-    tag: 2.2.5-python3.8
+    tag: 2.5.3-python3.8
 
   ## the airflow executor type to use
   executor: CeleryKubernetesExecutor
diff --git a/charts/airflow/sample-values-KubernetesExecutor.yaml b/charts/airflow/sample-values-KubernetesExecutor.yaml
index 06e997e7..8ccbdd46 100644
--- a/charts/airflow/sample-values-KubernetesExecutor.yaml
+++ b/charts/airflow/sample-values-KubernetesExecutor.yaml
@@ -9,7 +9,7 @@ airflow:
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/configuration/airflow-version.md
   image:
     repository: apache/airflow
-    tag: 2.2.5-python3.8
+    tag: 2.5.3-python3.8
 
   ## the airflow executor type to use
   executor: KubernetesExecutor
diff --git a/charts/airflow/values.yaml b/charts/airflow/values.yaml
index 7fe4fb13..9bbe6aa2 100644
--- a/charts/airflow/values.yaml
+++ b/charts/airflow/values.yaml
@@ -10,7 +10,7 @@ airflow:
   ##
   image:
     repository: apache/airflow
-    tag: 2.2.5-python3.8
+    tag: 2.5.3-python3.8
     pullPolicy: IfNotPresent
     pullSecret: ""
     uid: 50000
@@ -1359,8 +1359,8 @@ dags:
     ## the git-sync container image
     ##
     image:
-      repository: k8s.gcr.io/git-sync/git-sync
-      tag: v3.5.0
+      repository: registry.k8s.io/git-sync/git-sync
+      tag: v3.6.5
       pullPolicy: IfNotPresent
       uid: 65533
       gid: 65533
@@ -1886,6 +1886,14 @@ postgresql:
   ##
   enabled: true
 
+  ## configs for the postgres container image
+  ##
+  image:
+    registry: ghcr.io
+    repository: airflow-helm/postgresql-bitnami
+    tag: 11.16-patch.0
+    pullPolicy: IfNotPresent
+
   ## the postgres database to use
   ##
   postgresqlDatabase: airflow
@@ -2020,6 +2028,14 @@ redis:
   ##
   enabled: true
 
+  ## configs for the redis container image
+  ##
+  image:
+    registry: docker.io
+    repository: bitnami/redis
+    tag: 5.0.14-debian-10-r173
+    pullPolicy: IfNotPresent
+
   ## the redis password
   ##
   password: airflow