diff --git a/charts/radosgw/Chart.yaml b/charts/radosgw/Chart.yaml
index 040d7a5..534b114 100644
--- a/charts/radosgw/Chart.yaml
+++ b/charts/radosgw/Chart.yaml
@@ -4,4 +4,4 @@ appVersion: "14.2"
 description: CEPH RadosGW
 icon: http://ceph.com/wp-content/uploads/2016/07/Ceph_Logo_Stacked_RGB_120411_fa.png
 name: radosgw
-version: 0.2.1
+version: 0.3.0
diff --git a/charts/radosgw/templates/config.yaml b/charts/radosgw/templates/config.yaml
index 3db7539..ff51ae9 100644
--- a/charts/radosgw/templates/config.yaml
+++ b/charts/radosgw/templates/config.yaml
@@ -4,13 +4,18 @@ kind: ConfigMap
 metadata:
   name: {{ include "radosgw.fullname" . }}
   labels:
-{{ include "radosgw.labels" . | indent 4 }}
+    {{ include "radosgw.labels" . | nindent 4 }}
 data:
   ceph.conf: |+
     [global]
     mon_host = {{ include "helm-toolkit.utils.joinListWithComma" .Values.monHosts }}
-    rgw frontends = beast port=8008 endpoint=0.0.0.0:8080
     rgw dns name = {{ .Values.dnsName }}
+{{- if eq .Values.frontend "beast" }}
+    rgw frontends = beast port=8008 endpoint=0.0.0.0
+{{- else if eq .Values.frontend "civetweb" }}
+    rgw frontends = civetweb port=8008
+{{- end }}
 {{- if .Values.extraCephConf }}
-{{ .Values.extraCephConf | indent 4 }}
-{{- end -}}
+
+    {{ .Values.extraCephConf | nindent 4 }}
+{{- end }}
diff --git a/charts/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml
index afc1c29..1a7ea37 100644
--- a/charts/radosgw/templates/ingress.yaml
+++ b/charts/radosgw/templates/ingress.yaml
@@ -9,7 +9,7 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-{{ include "radosgw.labels" . | indent 4 }}
+    {{ include "radosgw.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/radosgw/templates/keyring.yaml b/charts/radosgw/templates/keyring.yaml
index 7de20a7..f8d7591 100644
--- a/charts/radosgw/templates/keyring.yaml
+++ b/charts/radosgw/templates/keyring.yaml
@@ -4,7 +4,7 @@ kind: Secret
 metadata:
   name: {{ include "radosgw.fullname" . }}
   labels:
-{{ include "radosgw.labels" . | indent 4 }}
+    {{ include "radosgw.labels" . | nindent 4 }}
 data:
   client.admin.keyring: {{ include "radosgw.keyringFile" (dict "Client" "admin" "Key" .Values.adminKey) | b64enc }}
   bootstrap-rgw.keyring: {{ include "radosgw.keyringFile" (dict "Client" "bootstrap-rgw" "Key" .Values.bootstrapKey) | b64enc }}
diff --git a/charts/radosgw/templates/service.yaml b/charts/radosgw/templates/service.yaml
index ccbf92a..f76f128 100644
--- a/charts/radosgw/templates/service.yaml
+++ b/charts/radosgw/templates/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ include "radosgw.fullname" . }}
   labels:
-{{ include "radosgw.labels" . | indent 4 }}
+    {{ include "radosgw.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/radosgw/templates/statefulset.yaml b/charts/radosgw/templates/statefulset.yaml
index 4ab9a6e..f0eee0c 100644
--- a/charts/radosgw/templates/statefulset.yaml
+++ b/charts/radosgw/templates/statefulset.yaml
@@ -4,7 +4,7 @@ kind: StatefulSet
 metadata:
   name: {{ include "radosgw.fullname" . }}
   labels:
-{{ include "radosgw.labels" . | indent 4 }}
+    {{ include "radosgw.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
diff --git a/charts/radosgw/values.yaml b/charts/radosgw/values.yaml
index d1c91a4..f66bf8c 100644
--- a/charts/radosgw/values.yaml
+++ b/charts/radosgw/values.yaml
@@ -13,9 +13,12 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-# monHosts: []
+monHosts: []
 dnsName: chart-example.local
 
+# The RadosGW frontend to use, either beast or civetweb
+frontend: beast
+
 # extraCephConf: |-
 
 # adminKey: