diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml
index 8ee27369e2..79d813a2c1 100644
--- a/stable/kong/Chart.yaml
+++ b/stable/kong/Chart.yaml
@@ -10,5 +10,5 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/kong
-version: 0.8.0
+version: 0.9.0
 appVersion: 1.0.0
diff --git a/stable/kong/ci/cassandra.yaml b/stable/kong/ci/cassandra.yaml
new file mode 100644
index 0000000000..4357ccd05f
--- /dev/null
+++ b/stable/kong/ci/cassandra.yaml
@@ -0,0 +1,7 @@
+env:
+  database: cassandra
+
+cassandra:
+  enabled: true
+postgres:
+  enabled: false
diff --git a/stable/kong/requirements.lock b/stable/kong/requirements.lock
index e1f78a8c47..c3070e187f 100644
--- a/stable/kong/requirements.lock
+++ b/stable/kong/requirements.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: postgresql
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.18.0
+  version: 3.9.1
 - name: cassandra
   repository: https://kubernetes-charts-incubator.storage.googleapis.com/
-  version: 0.2.6
-digest: sha256:936a09fac4dfb9a2785fcc4650bb7eea270262529acf091261f39fafdedc9aa2
-generated: 2018-09-06T16:46:47.888787-07:00
+  version: 0.10.2
+digest: sha256:ed6abe23258b9eb42a55b21ff68d5df7367e04d0c1de588442f6a91a067616a9
+generated: 2019-01-09T12:04:14.047647677-08:00
diff --git a/stable/kong/requirements.yaml b/stable/kong/requirements.yaml
index 2539691fe7..ab2c7755b2 100644
--- a/stable/kong/requirements.yaml
+++ b/stable/kong/requirements.yaml
@@ -1,9 +1,9 @@
 dependencies:
 - name: postgresql
-  version: ~0.18.0
+  version: ~3.9.1
   repository: https://kubernetes-charts.storage.googleapis.com/
   condition: postgresql.enabled
 - name: cassandra
-  version: ~0.2.6
+  version: ~0.10.2
   repository: https://kubernetes-charts-incubator.storage.googleapis.com/
   condition: cassandra.enabled
diff --git a/stable/kong/templates/controller-deployment.yaml b/stable/kong/templates/controller-deployment.yaml
index 08e445de9e..9329b8f807 100644
--- a/stable/kong/templates/controller-deployment.yaml
+++ b/stable/kong/templates/controller-deployment.yaml
@@ -59,7 +59,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
@@ -95,7 +95,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
diff --git a/stable/kong/templates/deployment.yaml b/stable/kong/templates/deployment.yaml
index 807d357588..d7191ac1b0 100644
--- a/stable/kong/templates/deployment.yaml
+++ b/stable/kong/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
@@ -101,7 +101,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
diff --git a/stable/kong/templates/migrations-post-upgrade.yaml b/stable/kong/templates/migrations-post-upgrade.yaml
index 0afec9c6d9..0f642708da 100644
--- a/stable/kong/templates/migrations-post-upgrade.yaml
+++ b/stable/kong/templates/migrations-post-upgrade.yaml
@@ -42,7 +42,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
       {{- end }}
       containers:
@@ -65,7 +65,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
diff --git a/stable/kong/templates/migrations-pre-upgrade.yaml b/stable/kong/templates/migrations-pre-upgrade.yaml
index 9328aeb385..1628789781 100644
--- a/stable/kong/templates/migrations-pre-upgrade.yaml
+++ b/stable/kong/templates/migrations-pre-upgrade.yaml
@@ -42,7 +42,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
       {{- end }}
       containers:
@@ -65,7 +65,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
diff --git a/stable/kong/templates/migrations.yaml b/stable/kong/templates/migrations.yaml
index ed3d3c3907..b9b173a2f7 100644
--- a/stable/kong/templates/migrations.yaml
+++ b/stable/kong/templates/migrations.yaml
@@ -37,7 +37,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         command: [ "/bin/sh", "-c", "until nc -zv $KONG_PG_HOST $KONG_PG_PORT -w1; do echo 'waiting for db'; sleep 1; done" ]
       {{- end }}
       containers:
@@ -60,7 +60,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ template "kong.postgresql.fullname" . }}
-              key: postgres-password
+              key: postgresql-password
         {{- end }}
         {{- if .Values.cassandra.enabled }}
         - name: KONG_CASSANDRA_CONTACT_POINTS
diff --git a/stable/kong/values.yaml b/stable/kong/values.yaml
index f65794930c..2953eaa217 100644
--- a/stable/kong/values.yaml
+++ b/stable/kong/values.yaml
@@ -158,8 +158,8 @@ cassandra:
 # PostgreSQL chart configs
 postgresql:
   enabled: true
-  postgresUser: kong
-  postgresDatabase: kong
+  postgresqlUsername: kong
+  postgresqlDatabase: kong
   service:
     port: 5432