diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a7cbef8..9d232b92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v0.8.2 - 2020-01-13]
+## [v0.9.0 - 2020-08-14]
+
+The reason for the bump in minor version is that the default PostgreSQL version is changed from 12 to 13,
+which is an incompatible change for older deployments.
+### Changed
+ * Use the PostgreSQL 13 Docker Image by default
+
+## [v0.8.2 - 2021-01-13]
 ### Fixed
  * Allow `podManagementPolicy` to be specified in the `values.yaml`
 
-## [v0.8.1 - 2020-01-13]
+## [v0.8.1 - 2021-01-13]
 ### Fixed
  * Port name for postgres-exporter fits the k8s constraints
 
-## [v0.8.0 - 2020-01-12]
+## [v0.8.0 - 2021-01-12]
 
 ### Added
  * Validate `values` schema
diff --git a/charts/repo/index.yaml b/charts/repo/index.yaml
index 3c136631..a4715288 100644
--- a/charts/repo/index.yaml
+++ b/charts/repo/index.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 entries:
   timescaledb-multinode:
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.863178873+01:00"
+    created: "2021-04-12T14:27:32.368475328+02:00"
     description: TimescaleDB Multinode Deployment.
     digest: 101d72220765f49e6b081c134c1f793bbe90d7f67a4f4c36c794be989e34623d
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -18,7 +18,7 @@ entries:
     - timescaledb-multinode-0.8.0.tgz
     version: 0.8.0
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.862237198+01:00"
+    created: "2021-04-12T14:27:32.367943817+02:00"
     description: TimescaleDB Multinode Deployment.
     digest: db2bea7290cd265835e11859a39e72562c7e21f1a90df0401e14e05d7adea1d6
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -34,7 +34,7 @@ entries:
     - timescaledb-multinode-0.7.0.tgz
     version: 0.7.0
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.860772557+01:00"
+    created: "2021-04-12T14:27:32.36740087+02:00"
     description: TimescaleDB Multinode Deployment.
     digest: d537d361eb0f72bce12d8e4f993dbc980f7850a22bb1a7bcd8825a7a4a00d38f
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -50,7 +50,7 @@ entries:
     - timescaledb-multinode-0.6.3.tgz
     version: 0.6.3
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.860050244+01:00"
+    created: "2021-04-12T14:27:32.36684507+02:00"
     description: TimescaleDB Multinode Deployment.
     digest: a6c664a75489e069cdd2d36dff87ca6d2b3a38a3edf16de4234418b354e40eea
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -67,7 +67,23 @@ entries:
     version: 0.3.0
   timescaledb-single:
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.904331054+01:00"
+    created: "2021-04-12T14:27:32.398815015+02:00"
+    description: TimescaleDB HA Deployment.
+    digest: 8bb26c938538e767a0da086f7535e1b81fa03af292becf44d406d7a8d8da9321
+    home: https://github.com/timescale/timescaledb-kubernetes
+    maintainers:
+    - email: support@timescale.com
+      name: TimescaleDB
+    name: timescaledb-single
+    sources:
+    - https://github.com/timescale/timescaledb-kubernetes
+    - https://github.com/timescale/timescaledb-docker-ha
+    - https://github.com/zalando/patroni
+    urls:
+    - timescaledb-single-0.9.0.tgz
+    version: 0.9.0
+  - apiVersion: v1
+    created: "2021-04-12T14:27:32.396520469+02:00"
     description: TimescaleDB HA Deployment.
     digest: a976fc399539e012942a3e55dce1d735c5c36bb4678e57a66ac7d280c8bfceb9
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -83,7 +99,7 @@ entries:
     - timescaledb-single-0.8.2.tgz
     version: 0.8.2
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.901618938+01:00"
+    created: "2021-04-12T14:27:32.39453048+02:00"
     description: TimescaleDB HA Deployment.
     digest: d047ac65b447b75f748c6fe94cec7ed208e91c20b42eb912baa7aa4f4131518c
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -99,7 +115,7 @@ entries:
     - timescaledb-single-0.8.1.tgz
     version: 0.8.1
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.898339636+01:00"
+    created: "2021-04-12T14:27:32.392625053+02:00"
     description: TimescaleDB HA Deployment.
     digest: 63a9d362ea53efbe6103b8fd0cf07400aa2ccb090740eda213f862d588320c79
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -115,7 +131,7 @@ entries:
     - timescaledb-single-0.8.0.tgz
     version: 0.8.0
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.895674981+01:00"
+    created: "2021-04-12T14:27:32.390635441+02:00"
     description: TimescaleDB HA Deployment.
     digest: 1948357489eff42eb81bcb59a465615e20b791dc54178d1bbaf1a650b7f46de1
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -131,7 +147,7 @@ entries:
     - timescaledb-single-0.7.1.tgz
     version: 0.7.1
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.893042284+01:00"
+    created: "2021-04-12T14:27:32.388602011+02:00"
     description: TimescaleDB HA Deployment.
     digest: 39e270f51713dd0f2be64c8a80d747bc1e78173fd3e2c6172ff993f9a7dacd1b
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -147,7 +163,7 @@ entries:
     - timescaledb-single-0.7.0.tgz
     version: 0.7.0
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.890570782+01:00"
+    created: "2021-04-12T14:27:32.386868236+02:00"
     description: TimescaleDB HA Deployment.
     digest: 463bf4eca84cbefbd2e4a88928fe1ccc59a69fb95a4952ce15ca746adb479a29
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -163,7 +179,7 @@ entries:
     - timescaledb-single-0.6.2.tgz
     version: 0.6.2
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.887679824+01:00"
+    created: "2021-04-12T14:27:32.38534498+02:00"
     description: TimescaleDB HA Deployment.
     digest: 8ad82438d3fc818e6729afa77607521b7510b68fa4e0b4e7d0836f33990f0a63
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -179,7 +195,7 @@ entries:
     - timescaledb-single-0.6.1.tgz
     version: 0.6.1
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.885692035+01:00"
+    created: "2021-04-12T14:27:32.383853585+02:00"
     description: TimescaleDB HA Deployment.
     digest: b1c985faf6852aea91e6931230d19656f126fb7eabff004e92ffa2fb411cfbe2
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -195,7 +211,7 @@ entries:
     - timescaledb-single-0.6.0.tgz
     version: 0.6.0
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.883224742+01:00"
+    created: "2021-04-12T14:27:32.382306958+02:00"
     description: TimescaleDB HA Deployment.
     digest: 977ccd3dfe52e84a18e9ecf8c4138a937621910f743071fff58b497c357afb7c
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -211,7 +227,7 @@ entries:
     - timescaledb-single-0.5.8.tgz
     version: 0.5.8
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.880199611+01:00"
+    created: "2021-04-12T14:27:32.380478308+02:00"
     description: TimescaleDB HA Deployment.
     digest: 069c515c7055289ecf8189962e648e033053e8e7bdb47c39f9ec058e99911183
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -227,7 +243,7 @@ entries:
     - timescaledb-single-0.5.7.tgz
     version: 0.5.7
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.877398505+01:00"
+    created: "2021-04-12T14:27:32.378981809+02:00"
     description: TimescaleDB HA Deployment.
     digest: f0c9b30a4bf3d3e9c221efa37946bef05bad7fe79eb1808a7c8088c2d24e1075
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -243,7 +259,7 @@ entries:
     - timescaledb-single-0.5.6.tgz
     version: 0.5.6
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.875486182+01:00"
+    created: "2021-04-12T14:27:32.37748912+02:00"
     description: TimescaleDB HA Deployment.
     digest: 27098601d61f727ac71c2bfb67a1240c99188fc56ab4d0a0375cf5abc09547dc
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -259,7 +275,7 @@ entries:
     - timescaledb-single-0.5.5.tgz
     version: 0.5.5
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.873363364+01:00"
+    created: "2021-04-12T14:27:32.376116858+02:00"
     description: TimescaleDB HA Deployment.
     digest: 5bd289b789c7fae00b98ae9d1ce0b86e6b8463fbe4fbdaf20d59b60aca137580
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -275,7 +291,7 @@ entries:
     - timescaledb-single-0.5.4.tgz
     version: 0.5.4
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.871510635+01:00"
+    created: "2021-04-12T14:27:32.374771844+02:00"
     description: TimescaleDB HA Deployment.
     digest: 6cd19bcb822c9610ad13fbe49b03c3bd9d5f4655920b44e41f937487ecf86d9d
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -291,7 +307,7 @@ entries:
     - timescaledb-single-0.5.3.tgz
     version: 0.5.3
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.869136225+01:00"
+    created: "2021-04-12T14:27:32.373587337+02:00"
     description: TimescaleDB HA Deployment.
     digest: 9e2570426e0445a2e4f079fe757bbaadbc95a764c12ce10903f426d3b69cfde9
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -307,7 +323,7 @@ entries:
     - timescaledb-single-0.5.2.tgz
     version: 0.5.2
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.867617969+01:00"
+    created: "2021-04-12T14:27:32.371986155+02:00"
     description: TimescaleDB HA Deployment.
     digest: 128a7f0738f176a2abe6b7e1c3a1173ac6c4a77f7816704add3f0664609915aa
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -323,7 +339,7 @@ entries:
     - timescaledb-single-0.5.1.tgz
     version: 0.5.1
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.866190572+01:00"
+    created: "2021-04-12T14:27:32.370764712+02:00"
     description: TimescaleDB HA Deployment.
     digest: f4e0e05c989f04c78d9bd0a5b7ab2c6e1d2227af72ad05f7451a3e01b462bba0
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -339,7 +355,7 @@ entries:
     - timescaledb-single-0.5.0.tgz
     version: 0.5.0
   - apiVersion: v1
-    created: "2021-01-13T16:56:11.864563794+01:00"
+    created: "2021-04-12T14:27:32.369619685+02:00"
     description: TimescaleDB HA Deployment.
     digest: 2ae9d4a4ba25caf626e837244bf092721439e822d486f2c17f238b479012dedb
     home: https://github.com/timescale/timescaledb-kubernetes
@@ -354,4 +370,4 @@ entries:
     urls:
     - timescaledb-single-0.4.0.tgz
     version: 0.4.0
-generated: "2021-01-13T16:56:11.858641406+01:00"
+generated: "2021-04-12T14:27:32.366210995+02:00"
diff --git a/charts/repo/timescaledb-single-0.9.0.tgz b/charts/repo/timescaledb-single-0.9.0.tgz
new file mode 100644
index 00000000..263e3c77
Binary files /dev/null and b/charts/repo/timescaledb-single-0.9.0.tgz differ
diff --git a/charts/timescaledb-multinode/admin-guide.md b/charts/timescaledb-multinode/admin-guide.md
index 4a8f9514..b06ca784 100644
--- a/charts/timescaledb-multinode/admin-guide.md
+++ b/charts/timescaledb-multinode/admin-guide.md
@@ -19,7 +19,7 @@ The following table lists the configurable parameters of the TimescaleDB Helm ch
 | `nameOverride`                    | Override the name of the chart              | `timescaledb`                                       |
 | `fullnameOverride`                | Override the fullname of the chart          | `nil`                                               |
 | `replicaCount`                    | Amount of pods to spawn                     | `3`                                                 |
-| `image.repository`                | The image to pull                           | `timescaledev/timescaledb-ha`                       |
+| `image.repository`                | The image to pull                           | `timescale/timescaledb-ha`                          |
 | `image.tag`                       | The version of the image to pull            | `pg12.5-ts2.0.0-p0`
 | `image.pullPolicy`                | The pull policy                             | `IfNotPresent`                                      |
 | `credentials.accessNode.superuser`| Password of the superuser for the Access Node | `tea`                                             |
diff --git a/charts/timescaledb-multinode/values.yaml b/charts/timescaledb-multinode/values.yaml
index 566c9973..f991dbd3 100644
--- a/charts/timescaledb-multinode/values.yaml
+++ b/charts/timescaledb-multinode/values.yaml
@@ -10,7 +10,7 @@ nameOverride: timescaledb
 image:
   # Image was built from
   # https://github.com/timescale/timescaledb-docker-ha
-  repository: timescaledev/timescaledb-ha
+  repository: timescale/timescaledb-ha
   tag: pg12-ts2.0.0-p0
   pullPolicy: IfNotPresent
 
diff --git a/charts/timescaledb-single/Chart.yaml b/charts/timescaledb-single/Chart.yaml
index 95c5f2f2..ee40b88a 100644
--- a/charts/timescaledb-single/Chart.yaml
+++ b/charts/timescaledb-single/Chart.yaml
@@ -4,7 +4,7 @@
 apiVersion: v1
 name: timescaledb-single
 description: 'TimescaleDB HA Deployment.'
-version: 0.8.2
+version: 0.9.0
 # appVersion specifies the version of the software, which can vary wildly,
 # e.g. TimescaleDB 1.4.1 on PostgreSQL 11 or TimescaleDB 1.5.0 on PostgreSQL 12.
 # https://github.com/helm/helm/blob/master/docs/charts.md#the-appversion-field
diff --git a/charts/timescaledb-single/README.md b/charts/timescaledb-single/README.md
index 72910efe..a7f19aa9 100644
--- a/charts/timescaledb-single/README.md
+++ b/charts/timescaledb-single/README.md
@@ -22,7 +22,7 @@ High Availability (HA) configuration on Kubernetes. This chart will do the follo
 
 - Creates three (by default) pods using a Kubernetes [StatefulSet](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/).
 - Each pod has a container created using the [TimescaleDB Docker image](https://github.com/timescale/timescaledb-docker-ha).
-  - TimescaleDB 1.7 and PG 12
+  - TimescaleDB 2.1 and PG 13
 - Each of the containers runs a TimescaleDB instance and [Patroni](https://patroni.readthedocs.io/en/latest/) agent.
 - Each TimescaleDB instance is configured for replication (1 Master + 2 Replicas).
 
@@ -113,7 +113,7 @@ chart itself.
 * And install the chart:
 
   ```console
-  helm install --name my-release .
+  helm install my-release .
   ```
 
 To keep the repo up to date with new versions you can do:
diff --git a/charts/timescaledb-single/admin-guide.md b/charts/timescaledb-single/admin-guide.md
index 40098d7c..2cc74443 100644
--- a/charts/timescaledb-single/admin-guide.md
+++ b/charts/timescaledb-single/admin-guide.md
@@ -34,8 +34,8 @@ The following table lists the configurable parameters of the TimescaleDB Helm ch
 | `envFrom`                         | Extra custom environment variables, expressed as [EnvFrom](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.16/#envfromsource-v1-core) | `[]`                                                |
 | `fullnameOverride`                | Override the fullname of the chart          | `nil`                                               |
 | `image.pullPolicy`                | The pull policy                             | `IfNotPresent`                                      |
-| `image.repository`                | The image to pull                           | `timescaledev/timescaledb-ha`                       |
-| `image.tag`                       | The version of the image to pull            | `pg12-ts2.0-latest`
+| `image.repository`                | The image to pull                           | `timescale/timescaledb-ha`                       |
+| `image.tag`                       | The version of the image to pull            | `pg13-ts2.1-latest`
 | `loadBalancer.annotations`        | Pass on annotations to the Load Balancer    | An AWS ELB annotation to increase the idle timeout  |
 | `loadBalancer.enabled`            | If enabled, creates a LB for the primary    | `true`                                              |
 | `loadBalancer.extraSpec`          | Extra configuration for service spec        | `nil`                                               |
@@ -159,7 +159,7 @@ at: https://pgbackrest.org/command.html#introduction
     ```yaml
     # Filename: myvalues.yaml
     image:
-      tag: pg12.5-ts2.0.0-p0
+      tag: pg13.2-ts2.1.1-p1
       pullPolicy: Always
     patroni:
       postgresql:
diff --git a/charts/timescaledb-single/upgrade-guide.md b/charts/timescaledb-single/upgrade-guide.md
index 6cf0406d..28769f96 100644
--- a/charts/timescaledb-single/upgrade-guide.md
+++ b/charts/timescaledb-single/upgrade-guide.md
@@ -4,6 +4,7 @@ Before you upgrade your deployment, you should ensure you have
 followed the version specific upgrade guides.
 
 ##### Upgrade guides
+- [0.8 to 0.9](#upgrading-from-08x-to-09x)
 - [0.7 to 0.8](#upgrading-from-07x-to-08x)
 - [0.6 to 0.7](#upgrading-from-06x-to-07x)
 - [0.5 to 0.6](#upgrading-from-05x-to-06x)
@@ -17,6 +18,20 @@ After you have followed the upgrade guide you should be able to upgrade your dep
 helm upgrade --install my-release ./charts/timescaledb-single -f values/my-release.yaml
 ```
 
+# Upgrading from 0.8 to 0.9
+The default Docker Image now points to PostgreSQL 13 instead of PostgreSQL 13,
+the default image however does contain the PostgreSQL 12 binaries as well.
+
+If you want to run PostgreSQL 12 on the 0.9 Helm Charts you should set version to 12 in
+your `values.yaml`:
+
+```yaml
+version: 12
+```
+
+If you upgrade from Helm Charts version 0.7 or earlier, you should also follow the upgrade
+guide [0.7 to 0.8](#upgrading-from-07x-to-08x)
+
 # Upgrading from 0.7 to 0.8
 Version 0.8 includes [Helm Schema Validation](https://helm.sh/docs/topics/charts/#schema-files)
 for the `values.yaml` provided to Helm. If you have extra or incorrectly specified values in your
diff --git a/charts/timescaledb-single/values.yaml b/charts/timescaledb-single/values.yaml
index ee030ca7..32d0fa94 100644
--- a/charts/timescaledb-single/values.yaml
+++ b/charts/timescaledb-single/values.yaml
@@ -19,8 +19,8 @@ version:
 image:
   # Image was built from
   # https://github.com/timescale/timescaledb-docker-ha
-  repository: timescaledev/timescaledb-ha
-  tag: pg12-ts2.0-latest
+  repository: timescale/timescaledb-ha
+  tag: pg13-ts2.1-latest
   pullPolicy: Always
 
 # These secrets should exist before the Helm is used to deploy this TimescaleDB.
diff --git a/tests/wait_for_example_job.yaml b/tests/wait_for_example_job.yaml
index 004e6b17..e09b3427 100644
--- a/tests/wait_for_example_job.yaml
+++ b/tests/wait_for_example_job.yaml
@@ -11,7 +11,7 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: waiter
-        image: timescaledev/timescaledb-ha:pg12-ts2.0-latest
+        image: timescale/timescaledb-ha:pg13-ts2.1-latest
         resources:
           limits:
             cpu: 100m