diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml
index 392b3066f7..a41d6e808f 100644
--- a/stable/kong/Chart.yaml
+++ b/stable/kong/Chart.yaml
@@ -12,5 +12,5 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/kong
-version: 0.5.6
+version: 0.5.7
 appVersion: 0.14.1
diff --git a/stable/kong/README.md b/stable/kong/README.md
index 4b980dbb38..91e9ac19cd 100644
--- a/stable/kong/README.md
+++ b/stable/kong/README.md
@@ -61,6 +61,7 @@ and their default values.
 | admin.nodePort                    | Node port when service type is `NodePort`                              |                       |
 | admin.type                        | k8s service type, Options: NodePort, ClusterIP, LoadBalancer           | `NodePort`            |
 | admin.loadBalancerIP              | Will reuse an existing ingress static IP for the admin service         | `null`                |
+| admin.loadBalancerSourceRanges    | Limit admin access to CIDRs if set and service type is `LoadBalancer`  | `[]`                  |
 | admin.ingress.enabled             | Enable ingress resource creation (works with proxy.type=ClusterIP)     | `false`               |
 | admin.ingress.tls                 | Name of secret resource, containing TLS secret                         |                       |
 | admin.ingress.hosts               | List of ingress hosts.                                                 | `[]`                  |
@@ -72,6 +73,7 @@ and their default values.
 | proxy.nodePort                    | Node port when service type is `NodePort`                              |                       |
 | proxy.type                        | k8s service type. Options: NodePort, ClusterIP, LoadBalancer           | `NodePort`            |
 | proxy.loadBalancerIP              | To reuse an existing ingress static IP for the admin service           |                       |
+| proxy.loadBalancerSourceRanges    | Limit proxy access to CIDRs if set and service type is `LoadBalancer`  | `[]`                  |
 | proxy.ingress.enabled             | Enable ingress resource creation (works with proxy.type=ClusterIP)     | `false`               |
 | proxy.ingress.tls                 | Name of secret resource, containing TLS secret                         |                       |
 | proxy.ingress.hosts               | List of ingress hosts.                                                 | `[]`                  |
@@ -108,7 +110,7 @@ Postgres is enabled by default.
 | env.database                      | Choose either `postgres` or `cassandra`                                | `postgres`            |
 | env.pg_user                       | Postgres username                                                      | `kong`                |
 | env.pg_database                   | Postgres database name                                                 | `kong`                |
-| env.pg_password                   | Postgres database password (required if you are using your own database)| `kong`         |
+| env.pg_password                   | Postgres database password (required if you are using your own database)| `kong`               |
 | env.pg_host                       | Postgres database host (required if you are using your own database)   | ``                    |
 | env.pg_port                       | Postgres database port                                                 | `5432`                |
 | env.cassandra_contact_points      | Cassandra contact points (required if you are using your own database) | ``                    |
diff --git a/stable/kong/ci/default-values.yaml b/stable/kong/ci/default-values.yaml
new file mode 120000
index 0000000000..5d1191e9d1
--- /dev/null
+++ b/stable/kong/ci/default-values.yaml
@@ -0,0 +1 @@
+../values.yaml
\ No newline at end of file
diff --git a/stable/kong/ci/loadbalancer-values.yaml b/stable/kong/ci/loadbalancer-values.yaml
new file mode 100644
index 0000000000..eb2a7b97c7
--- /dev/null
+++ b/stable/kong/ci/loadbalancer-values.yaml
@@ -0,0 +1,44 @@
+# CI test for LoadBalancer admin/proxy types
+
+admin:
+  useTLS: true
+  type: LoadBalancer
+  loadBalancerSourceRanges:
+    - 192.168.1.1/32
+    - 10.10.10.10/32
+
+proxy:
+  useTLS: true
+  type: LoadBalancer
+  loadBalancerSourceRanges:
+    - 192.168.1.1/32
+    - 10.10.10.10/32
+
+readinessProbe:
+  httpGet:
+    path: "/status"
+    port: admin
+    scheme: HTTPS
+  initialDelaySeconds: 30
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 5
+
+livenessProbe:
+  httpGet:
+    path: "/status"
+    port: admin
+    scheme: HTTPS
+  initialDelaySeconds: 30
+  timeoutSeconds: 5
+  periodSeconds: 30
+  successThreshold: 1
+  failureThreshold: 5
+
+postgresql:
+  enabled: true
+  postgresUser: kong
+  postgresDatabase: kong
+  service:
+    port: 5432
diff --git a/stable/kong/kong-0.5.7.tgz b/stable/kong/kong-0.5.7.tgz
new file mode 100644
index 0000000000..cf3a74d53a
Binary files /dev/null and b/stable/kong/kong-0.5.7.tgz differ
diff --git a/stable/kong/templates/service-kong-admin.yaml b/stable/kong/templates/service-kong-admin.yaml
index 3b222ad9a1..686efb0593 100644
--- a/stable/kong/templates/service-kong-admin.yaml
+++ b/stable/kong/templates/service-kong-admin.yaml
@@ -13,9 +13,17 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   type: {{ .Values.admin.type }}
-  {{- if and (eq .Values.admin.type "LoadBalancer") .Values.admin.loadBalancerIP }}
+  {{- if eq .Values.admin.type "LoadBalancer" }}
+  {{- if .Values.admin.loadBalancerIP }}
   loadBalancerIP: {{ .Values.admin.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.admin.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range $cidr := .Values.admin.loadBalancerSourceRanges }}
+  - {{ $cidr }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
   ports:
   - name: kong-admin
     port: {{ .Values.admin.servicePort }}
diff --git a/stable/kong/templates/service-kong-proxy.yaml b/stable/kong/templates/service-kong-proxy.yaml
index aed2fc6884..b2b3ebcf71 100644
--- a/stable/kong/templates/service-kong-proxy.yaml
+++ b/stable/kong/templates/service-kong-proxy.yaml
@@ -13,9 +13,17 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   type: {{ .Values.proxy.type }}
-  {{- if and (eq .Values.proxy.type "LoadBalancer") .Values.proxy.loadBalancerIP }}
+  {{- if eq .Values.proxy.type "LoadBalancer" }}
+  {{- if .Values.proxy.loadBalancerIP }}
   loadBalancerIP: {{ .Values.proxy.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.proxy.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range $cidr := .Values.admin.loadBalancerSourceRanges }}
+  - {{ $cidr }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
   ports:
   - name: kong-proxy
     port: {{ .Values.proxy.servicePort }}