diff --git a/charts/pravega/templates/pravega.yaml b/charts/pravega/templates/pravega.yaml
index b49076257..7e774da15 100644
--- a/charts/pravega/templates/pravega.yaml
+++ b/charts/pravega/templates/pravega.yaml
@@ -37,34 +37,30 @@ spec:
     controllerExtServiceType: {{ .Values.controller.service.type }}
     {{- end }}
     {{- if .Values.controller.service.annotations }}
-    controllerSvcAnnotations: {{ .Values.controller.service.annotations }}
+    controllerSvcAnnotations:
+{{ toYaml .Values.controller.service.annotations | indent 6 }}
     {{- end }}
     {{- if .Values.segmentStore.service.type }}
     segmentStoreExtServiceType: {{ .Values.segmentStore.service.type }}
     {{- end }}
     {{- if .Values.segmentStore.service.annotations }}
-    segmentStoreSvcAnnotations: {{ .Values.segmentStore.service.annotations }}
+    segmentStoreSvcAnnotations:
+{{ toYaml .Values.segmentStore.service.annotations | indent 6 }}
     {{- end }}
     {{- end }}
     image:
       repository: {{ .Values.image.repository }}
       pullPolicy: {{ .Values.image.pullPolicy }}
     controllerReplicas: {{ .Values.controller.replicas }}
+    {{- if .Values.controller.resources }}
     controllerResources:
-      requests:
-        memory: {{ .Values.controller.resources.requests.memory | quote }}
-        cpu: {{ .Values.controller.resources.requests.cpu | quote }}
-      limits:
-        memory: {{ .Values.controller.resources.limits.memory | quote }}
-        cpu: {{ .Values.controller.resources.limits.cpu | quote }}
+{{ toYaml .Values.controller.resources | indent 6 }}
+    {{- end }}
     segmentStoreReplicas: {{ .Values.segmentStore.replicas }}
+    {{- if .Values.segmentStore.resources }}
     segmentStoreResources:
-      requests:
-        memory: {{ .Values.segmentStore.resources.requests.memory | quote }}
-        cpu: {{ .Values.segmentStore.resources.requests.cpu | quote }}
-      limits:
-        memory: {{ .Values.segmentStore.resources.limits.memory | quote }}
-        cpu: {{ .Values.segmentStore.resources.limits.cpu | quote }}
+{{ toYaml .Values.segmentStore.resources | indent 6 }}
+    {{- end }}
     {{- if .Values.segmentStore.env }}
     segmentStoreEnvVars: {{ .Values.segmentStore.env }}
     {{- end }}
diff --git a/setup/pravegacluster.sh b/setup/pravegacluster.sh
index adc97decc..80174081e 100755
--- a/setup/pravegacluster.sh
+++ b/setup/pravegacluster.sh
@@ -35,12 +35,14 @@ deploy_cluster () {
 }
 
 destroy_cluster(){
+	set +ex
 	helm uninstall pravega
 	helm uninstall bookkeeper
 	helm uninstall zookeeper
 	helm uninstall pravega-operator
 	helm uninstall bookkeeper-operator
 	helm uninstall zookeeper-operator
+	set -ex
 }
 
 if [ $1 == "deploy" ]; then