diff --git a/chart/templates/ad-service.yaml b/chart/templates/ad-service.yaml
index 7a735105..45193022 100644
--- a/chart/templates/ad-service.yaml
+++ b/chart/templates/ad-service.yaml
@@ -16,15 +16,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.adService.name}}
+  name: unguard-{{ .Values.adService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.adService.name}}
+    app.kubernetes.io/name: {{ .Values.adService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.adService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.adService.name}}
+    app.kubernetes.io/name: {{ .Values.adService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.adService.service.ports | toYaml | nindent 4 }}
@@ -33,31 +33,31 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.adService.name}}
+  name: unguard-{{ .Values.adService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.adService.name}}
+    app.kubernetes.io/name: {{ .Values.adService.name }}
     app.kubernetes.io/part-of: unguard
     {{ include "renderLabels" .Values.labels.common }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.adService.name}}
+      app.kubernetes.io/name: {{ .Values.adService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.adService.deployment.strategy.type}}
+    type: {{ .Values.adService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.adService.name}}
+        app.kubernetes.io/name: {{ .Values.adService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.adService.name}}
-          image: {{.Values.adService.deployment.container.image.repository}}:{{.Values.adService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.adService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.adService.name }}
+          image: {{ .Values.adService.deployment.container.image.repository }}:{{ .Values.adService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.adService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.adService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.adService.deployment.container.ports.containerPort }}
           env:
             - name: ASPNETCORE_ENVIRONMENT
               value: {{ quote .Values.adService.deployment.container.env.ASPNETCORE_ENVIRONMENT }}
@@ -68,7 +68,7 @@ spec:
             - name: USER_AUTH_SERVICE_ADDRESS
               value: {{ quote .Values.adService.deployment.container.env.USER_AUTH_SERVICE_ADDRESS }}
             - name: JAEGER_SERVICE_NAME
-              value: {{quote (printf "unguard-%s" .Values.adService.name) }}
+              value: {{ quote (printf "unguard-%s" .Values.adService.name) }}
             - name: JAEGER_AGENT_HOST
               value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.adService.deployment.container.env.JAEGER_AGENT_HOST) }}
             - name: JAEGER_SAMPLER_TYPE
diff --git a/chart/templates/envoy-proxy.yaml b/chart/templates/envoy-proxy.yaml
index 14300675..0e637ea1 100644
--- a/chart/templates/envoy-proxy.yaml
+++ b/chart/templates/envoy-proxy.yaml
@@ -17,19 +17,19 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.envoyProxy.name}}
+  name: unguard-{{ .Values.envoyProxy.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.envoyProxy.name}}
+    app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
-  {{if .Values.aws.enabled}}
+  {{ if .Values.aws.enabled }}
   type: NodePort
-  {{else}}
+  {{ else }}
   type: {{ .Values.envoyProxy.service.type }}
-  {{end}}
+  {{ end }}
   selector:
-    app.kubernetes.io/name: {{.Values.envoyProxy.name}}
+    app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.envoyProxy.service.ports | toYaml | nindent 4 }}
@@ -38,28 +38,28 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.envoyProxy.name}}
+  name: unguard-{{ .Values.envoyProxy.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.envoyProxy.name}}
+    app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.envoyProxy.name}}
+      app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.envoyProxy.deployment.strategy.type}}
+    type: {{ .Values.envoyProxy.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.envoyProxy.name}}
+        app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.envoyProxy.name}}
-          image: {{.Values.envoyProxy.deployment.container.image.repository}}:{{.Values.envoyProxy.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.envoyProxy.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.envoyProxy.name }}
+          image: {{ .Values.envoyProxy.deployment.container.image.repository }}:{{ .Values.envoyProxy.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.envoyProxy.deployment.container.image.pullPolicy }}
           ports:
             {{- .Values.envoyProxy.deployment.container.ports | toYaml | nindent 12 }}
diff --git a/chart/templates/frontend.yaml b/chart/templates/frontend.yaml
index ae8c7c99..32c4845a 100644
--- a/chart/templates/frontend.yaml
+++ b/chart/templates/frontend.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.frontend.name}}
+  name: unguard-{{ .Values.frontend.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.frontend.name}}
+    app.kubernetes.io/name: {{ .Values.frontend.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.frontend.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.frontend.name}}
+    app.kubernetes.io/name: {{ .Values.frontend.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.frontend.service.ports | toYaml | nindent 4 }}
@@ -34,31 +34,31 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.frontend.name}}
+  name: unguard-{{ .Values.frontend.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.frontend.name}}
+    app.kubernetes.io/name: {{ .Values.frontend.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.frontend.name}}
+      app.kubernetes.io/name: {{ .Values.frontend.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.frontend.deployment.strategy.type}}
+    type: {{ .Values.frontend.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.frontend.name}}
+        app.kubernetes.io/name: {{ .Values.frontend.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.frontend.name}}
-          image: {{.Values.frontend.deployment.container.image.repository}}:{{.Values.frontend.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.frontend.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.frontend.name }}
+          image: {{ .Values.frontend.deployment.container.image.repository }}:{{ .Values.frontend.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.frontend.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.frontend.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.frontend.deployment.container.ports.containerPort }}
           env:
             - name: MICROBLOG_SERVICE_ADDRESS
               value: {{ quote .Values.frontend.deployment.container.env.MICROBLOG_SERVICE_ADDRESS }}
@@ -87,7 +87,7 @@ spec:
             - name: STATUS_SERVICE_BASE_PATH
               value: {{ quote .Values.frontend.deployment.container.env.STATUS_SERVICE_BASE_PATH }}
             - name: JAEGER_SERVICE_NAME
-              value: {{quote (printf "unguard-%s" .Values.frontend.name) }}
+              value: {{ quote (printf "unguard-%s" .Values.frontend.name) }}
             - name: JAEGER_AGENT_HOST
               value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.frontend.deployment.container.env.JAEGER_AGENT_HOST) }}
             - name: JAEGER_SAMPLER_TYPE
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 61e9dc15..b3c6b0b0 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -17,26 +17,26 @@ limitations under the License.
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: unguard-{{.Values.ingress.name}}
+  name: unguard-{{ .Values.ingress.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.ingress.name}}
+    app.kubernetes.io/name: {{ .Values.ingress.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
-  {{if .Values.aws.enabled}}
+  {{ if .Values.aws.enabled }}
   annotations:
   {{- .Values.aws.ingress.annotations | toYaml | nindent 4 }}
-  {{end}}
+  {{ end }}
 spec:
   rules:
-    {{if .Values.localDev.enabled}}
+    {{ if .Values.localDev.enabled }}
     - host: unguard.kube
-    {{end}}
-    {{if .Values.localDev.enabled}}
+    {{ end }}
+    {{ if .Values.localDev.enabled }}
       http:
-    {{end}}
-    {{if .Values.aws.enabled}}
+    {{ end }}
+    {{ if .Values.aws.enabled }}
     - http:
-    {{end}}
+    {{ end }}
         paths:
           - path: /healthz
             pathType: Prefix
@@ -52,4 +52,4 @@ spec:
                 name: unguard-envoy-proxy
                 port:
                   number: 8080
-{{end}}
+{{ end }}
diff --git a/chart/templates/like-service.yaml b/chart/templates/like-service.yaml
index a48d2a81..82145053 100644
--- a/chart/templates/like-service.yaml
+++ b/chart/templates/like-service.yaml
@@ -16,15 +16,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.likeService.name}}
+  name: unguard-{{ .Values.likeService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.likeService.name}}
+    app.kubernetes.io/name: {{ .Values.likeService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.likeService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.likeService.name}}
+    app.kubernetes.io/name: {{ .Values.likeService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.likeService.service.ports | toYaml | nindent 4 }}
@@ -33,31 +33,31 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.likeService.name}}
+  name: unguard-{{ .Values.likeService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.likeService.name}}
+    app.kubernetes.io/name: {{ .Values.likeService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.likeService.name}}
+      app.kubernetes.io/name: {{ .Values.likeService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.likeService.deployment.strategy.type}}
+    type: {{ .Values.likeService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.likeService.name}}
+        app.kubernetes.io/name: {{ .Values.likeService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.likeService.name}}
-          image: {{.Values.likeService.deployment.container.image.repository}}:{{.Values.likeService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.likeService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.likeService.name }}
+          image: {{ .Values.likeService.deployment.container.image.repository }}:{{ .Values.likeService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.likeService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.likeService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.likeService.deployment.container.ports.containerPort }}
           env:
             - name: SERVER_PORT
               value: {{ quote .Values.likeService.deployment.container.env.SERVER_PORT }}
@@ -71,8 +71,8 @@ spec:
                   name: {{ tpl .Values.likeService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.name . }}
                   key: {{ tpl .Values.likeService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.key . }}
             - name: JAEGER_SERVICE_NAME
-              value: {{quote (printf "unguard-%s" .Values.likeService.name) }}
-            {{if .Values.tracing.enabled}}
+              value: {{ quote (printf "unguard-%s" .Values.likeService.name) }}
+            {{ if .Values.tracing.enabled }}
             - name: JAEGER_COLLECTOR_HOST
               value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.likeService.deployment.container.env.JAEGER_COLLECTOR_HOST) }}
             - name: JAEGER_PORT
@@ -81,4 +81,4 @@ spec:
               value: {{ quote .Values.likeService.deployment.container.env.SERVICE_NAME }}
             - name: JAEGER_DISABLED
               value: {{ quote .Values.likeService.deployment.container.env.JAEGER_DISABLED }}
-            {{end}}
+            {{ end }}
diff --git a/chart/templates/malicious-load-generator.yaml b/chart/templates/malicious-load-generator.yaml
index c056faa1..3ddb6070 100644
--- a/chart/templates/malicious-load-generator.yaml
+++ b/chart/templates/malicious-load-generator.yaml
@@ -13,35 +13,35 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */}}
-{{if .Values.maliciousLoadGenerator.enabled}}
+{{ if .Values.maliciousLoadGenerator.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.maliciousLoadGenerator.name}}
+  name: unguard-{{ .Values.maliciousLoadGenerator.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.maliciousLoadGenerator.name}}
+    app.kubernetes.io/name: {{ .Values.maliciousLoadGenerator.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.maliciousLoadGenerator.name}}
+      app.kubernetes.io/name: {{ .Values.maliciousLoadGenerator.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.maliciousLoadGenerator.deployment.strategy.type}}
+    type: {{ .Values.maliciousLoadGenerator.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.maliciousLoadGenerator.name}}
+        app.kubernetes.io/name: {{ .Values.maliciousLoadGenerator.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
-      terminationGracePeriodSeconds: {{.Values.maliciousLoadGenerator.deployment.terminationGracePeriodSeconds}}
-      restartPolicy: {{.Values.maliciousLoadGenerator.deployment.restartPolicy}}
+      terminationGracePeriodSeconds: {{ .Values.maliciousLoadGenerator.deployment.terminationGracePeriodSeconds }}
+      restartPolicy: {{ .Values.maliciousLoadGenerator.deployment.restartPolicy }}
       containers:
-        - name: {{.Values.maliciousLoadGenerator.name}}
-          image: {{.Values.maliciousLoadGenerator.deployment.container.image.repository}}:{{.Values.maliciousLoadGenerator.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.maliciousLoadGenerator.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.maliciousLoadGenerator.name }}
+          image: {{ .Values.maliciousLoadGenerator.deployment.container.image.repository }}:{{ .Values.maliciousLoadGenerator.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.maliciousLoadGenerator.deployment.container.image.pullPolicy }}
           env: # could add here run time as well
             - name: FRONTEND_ADDR
               value: {{ quote .Values.maliciousLoadGenerator.deployment.container.env.FRONTEND_ADDR }}
@@ -55,4 +55,4 @@ spec:
           command: [ "/bin/sh", "-c" ]
           # TODO: #22 Replace this endpoint with a proper health check endpoint
           args: [ 'while [ $(curl -ksw "%{http_code}" "http://unguard-frontend:80/ui/img/logo.svg" -o /dev/null) -ne 200 ]; do sleep 5; echo "health check failed . Waiting for the service..."; done' ]
-{{end}}
+{{ end }}
diff --git a/chart/templates/membership-service.yaml b/chart/templates/membership-service.yaml
index b30c4ee3..9f930a48 100644
--- a/chart/templates/membership-service.yaml
+++ b/chart/templates/membership-service.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.membershipService.name}}
+  name: unguard-{{ .Values.membershipService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.membershipService.name}}
+    app.kubernetes.io/name: {{ .Values.membershipService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.membershipService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.membershipService.name}}
+    app.kubernetes.io/name: {{ .Values.membershipService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.membershipService.service.ports | toYaml | nindent 4 }}
@@ -33,31 +33,31 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.membershipService.name}}
+  name: unguard-{{ .Values.membershipService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.membershipService.name}}
+    app.kubernetes.io/name: {{ .Values.membershipService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.membershipService.name}}
+      app.kubernetes.io/name: {{ .Values.membershipService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.membershipService.deployment.strategy.type}}
+    type: {{ .Values.membershipService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.membershipService.name}}
+        app.kubernetes.io/name: {{ .Values.membershipService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.membershipService.name}}
-          image: {{.Values.membershipService.deployment.container.image.repository}}:{{.Values.membershipService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.membershipService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.membershipService.name }}
+          image: {{ .Values.membershipService.deployment.container.image.repository }}:{{ .Values.membershipService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.membershipService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.membershipService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.membershipService.deployment.container.ports.containerPort }}
           env:
             - name: ASPNETCORE_ENVIRONMENT
               value: {{ quote .Values.membershipService.deployment.container.env.ASPNETCORE_ENVIRONMENT }}
diff --git a/chart/templates/microblog-service.yaml b/chart/templates/microblog-service.yaml
index e3e9bf99..908f2043 100644
--- a/chart/templates/microblog-service.yaml
+++ b/chart/templates/microblog-service.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.microblogService.name}}
+  name: unguard-{{ .Values.microblogService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.microblogService.name}}
+    app.kubernetes.io/name: {{ .Values.microblogService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.microblogService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.microblogService.name}}
+    app.kubernetes.io/name: {{ .Values.microblogService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.microblogService.service.ports | toYaml | nindent 4 }}
@@ -34,31 +34,31 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.microblogService.name}}
+  name: unguard-{{ .Values.microblogService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.microblogService.name}}
+    app.kubernetes.io/name: {{ .Values.microblogService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.microblogService.name}}
+      app.kubernetes.io/name: {{ .Values.microblogService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.microblogService.deployment.strategy.type}}
+    type: {{ .Values.microblogService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.microblogService.name}}
+        app.kubernetes.io/name: {{ .Values.microblogService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.microblogService.name}}
-          image: {{.Values.microblogService.deployment.container.image.repository}}:{{.Values.microblogService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.microblogService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.microblogService.name }}
+          image: {{ .Values.microblogService.deployment.container.image.repository }}:{{ .Values.microblogService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.microblogService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.microblogService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.microblogService.deployment.container.ports.containerPort }}
           env:
             - name: SERVER_PORT
               value: {{ quote .Values.microblogService.deployment.container.env.SERVER_PORT }}
@@ -69,9 +69,9 @@ spec:
             - name: OPENTRACING_JAEGER_ENABLED
               value: {{ quote .Values.microblogService.deployment.container.env.OPENTRACING_JAEGER_ENABLED }}
             - name: JAEGER_SERVICE_NAME
-              value: {{quote (printf "unguard-%s" .Values.microblogService.name) }}
+              value: {{ quote (printf "unguard-%s" .Values.microblogService.name) }}
             - name: JAEGER_AGENT_HOST
-              value: {{quote (printf "%s-%s" .Values.jaeger.name .Values.microblogService.deployment.container.env.JAEGER_AGENT_HOST) }}
+              value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.microblogService.deployment.container.env.JAEGER_AGENT_HOST) }}
             - name: JAEGER_SAMPLER_TYPE
               value: {{ quote .Values.microblogService.deployment.container.env.JAEGER_SAMPLER_TYPE }}
             - name: JAEGER_SAMPLER_PARAM
diff --git a/chart/templates/payment-service.yaml b/chart/templates/payment-service.yaml
index 5fb24bc4..97215577 100644
--- a/chart/templates/payment-service.yaml
+++ b/chart/templates/payment-service.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.paymentService.name}}
+  name: unguard-{{ .Values.paymentService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.paymentService.name}}
+    app.kubernetes.io/name: {{ .Values.paymentService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.paymentService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.paymentService.name}}
+    app.kubernetes.io/name: {{ .Values.paymentService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
     - targetPort: {{ .Values.paymentService.containerPort }}
@@ -35,29 +35,29 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.paymentService.name}}
+  name: unguard-{{ .Values.paymentService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.paymentService.name}}
+    app.kubernetes.io/name: {{ .Values.paymentService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.paymentService.name}}
+      app.kubernetes.io/name: {{ .Values.paymentService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.paymentService.deployment.strategy.type}}
+    type: {{ .Values.paymentService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.paymentService.name}}
+        app.kubernetes.io/name: {{ .Values.paymentService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.paymentService.name}}
-          image: {{.Values.paymentService.deployment.container.image.repository}}:{{.Values.envoyProxy.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.paymentService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.paymentService.name }}
+          image: {{ .Values.paymentService.deployment.container.image.repository }}:{{ .Values.envoyProxy.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.paymentService.deployment.container.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.paymentService.containerPort }}
           env:
diff --git a/chart/templates/profile-service.yaml b/chart/templates/profile-service.yaml
index 5db2baf8..d9eece3b 100644
--- a/chart/templates/profile-service.yaml
+++ b/chart/templates/profile-service.yaml
@@ -16,15 +16,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.profileService.name}}
+  name: unguard-{{ .Values.profileService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.profileService.name}}
+    app.kubernetes.io/name: {{ .Values.profileService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.profileService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.profileService.name}}
+    app.kubernetes.io/name: {{ .Values.profileService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.profileService.service.ports | toYaml | nindent 4 }}
@@ -32,37 +32,37 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.profileService.name}}
+  name: unguard-{{ .Values.profileService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.profileService.name}}
+    app.kubernetes.io/name: {{ .Values.profileService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.profileService.name}}
+      app.kubernetes.io/name: {{ .Values.profileService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.profileService.deployment.strategy.type}}
+    type: {{ .Values.profileService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.profileService.name}}
+        app.kubernetes.io/name: {{ .Values.profileService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.profileService.name}}
+        - name: {{ .Values.profileService.name }}
           image: {{ .Values.profileService.deployment.container.image.repository }}:{{ .Values.profileService.deployment.container.image.tag | default .Chart.AppVersion }}
-          imagePullPolicy: {{.Values.profileService.deployment.container.image.pullPolicy}}
+          imagePullPolicy: {{ .Values.profileService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.profileService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.profileService.deployment.container.ports.containerPort }}
           livenessProbe:
             httpGet:
-              path: {{.Values.profileService.deployment.container.livenessProbe.httpGet.path}}
-              port: {{.Values.profileService.deployment.container.livenessProbe.httpGet.port}}
-            initialDelaySeconds: {{.Values.profileService.deployment.container.livenessProbe.initialDelaySeconds}}
-            periodSeconds: {{.Values.profileService.deployment.container.livenessProbe.periodSeconds}}
+              path: {{ .Values.profileService.deployment.container.livenessProbe.httpGet.path }}
+              port: {{ .Values.profileService.deployment.container.livenessProbe.httpGet.port }}
+            initialDelaySeconds: {{ .Values.profileService.deployment.container.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.profileService.deployment.container.livenessProbe.periodSeconds }}
           env:
             - name: SPRING_DATASOURCE_URL
               value: {{ quote .Values.profileService.deployment.container.env.SPRING_DATASOURCE_URL }}
@@ -71,18 +71,18 @@ spec:
             - name: SPRING_DATASOURCE_PASSWORD
               value: {{ quote .Values.profileService.deployment.container.env.SPRING_DATASOURCE_PASSWORD }}
             - name: OTEL_LOGS_EXPORTER
-              value: {{ quote .Values.profileService.deployment.container.env.OTEL_LOGS_EXPORTER}}
+              value: {{ quote .Values.profileService.deployment.container.env.OTEL_LOGS_EXPORTER }}
             - name: OTEL_METRICS_EXPORTER
               value: {{ quote .Values.profileService.deployment.container.env.OTEL_METRICS_EXPORTER }}
             - name: OTEL_RESOURCE_ATTRIBUTES
               value: {{ quote .Values.profileService.deployment.container.env.OTEL_RESOURCE_ATTRIBUTES }}
             - name: OTEL_TRACES_EXPORTER
               value: {{ quote .Values.profileService.deployment.container.env.OTEL_TRACES_EXPORTER }}
-            {{if .Values.tracing.enabled}}
+            {{ if .Values.tracing.enabled }}
             - name: OTEL_EXPERIMENTAL_SDK_ENABLED
               value: {{ quote .Values.profileService.deployment.container.env.OTEL_EXPERIMENTAL_SDK_ENABLED }}
             - name: OTEL_EXPORTER_JAEGER_ENDPOINT
               value: {{ quote .Values.profileService.deployment.container.env.OTEL_EXPORTER_JAEGER_ENDPOINT }}
             - name: OTEL_PROPAGATORS
               value: {{ quote .Values.profileService.deployment.container.env.OTEL_PROPAGATORS }}
-            {{end}}
+            {{ end }}
diff --git a/chart/templates/proxy-service.yaml b/chart/templates/proxy-service.yaml
index 488206d5..0ea86324 100644
--- a/chart/templates/proxy-service.yaml
+++ b/chart/templates/proxy-service.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.proxyService.name}}
+  name: unguard-{{ .Values.proxyService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.proxyService.name}}
+    app.kubernetes.io/name: {{ .Values.proxyService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
-  type: {{.Values.proxyService.service.type}}
+  type: {{ .Values.proxyService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.proxyService.name}}
+    app.kubernetes.io/name: {{ .Values.proxyService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.proxyService.service.ports | toYaml | nindent 4 }}
@@ -33,75 +33,75 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{.Values.proxyService.serviceAccount.name}}
+  name: {{ .Values.proxyService.serviceAccount.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.proxyService.name}}
+    app.kubernetes.io/name: {{ .Values.proxyService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{.Values.proxyService.role.name}}
+  name: {{ .Values.proxyService.role.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.proxyService.name}}
+    app.kubernetes.io/name: {{ .Values.proxyService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 rules:
-  {{- .Values.proxyService.role.rules | toYaml | nindent 2}}
+  {{- .Values.proxyService.role.rules | toYaml | nindent 2 }}
 
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{.Values.proxyService.roleBindings.name}}
+  name: {{ .Values.proxyService.roleBindings.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.proxyService.name}}
+    app.kubernetes.io/name: {{ .Values.proxyService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 subjects:
-  {{- .Values.proxyService.roleBindings.subjects | toYaml | nindent 2}}
+  {{- .Values.proxyService.roleBindings.subjects | toYaml | nindent 2 }}
 roleRef:
-  kind: {{.Values.proxyService.roleBindings.roleRef.kind}}
-  name: {{.Values.proxyService.roleBindings.roleRef.name}}
-  apiGroup: {{.Values.proxyService.roleBindings.roleRef.apiGroup}}
+  kind: {{ .Values.proxyService.roleBindings.roleRef.kind }}
+  name: {{ .Values.proxyService.roleBindings.roleRef.name }}
+  apiGroup: {{ .Values.proxyService.roleBindings.roleRef.apiGroup }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.proxyService.name}}
+  name: unguard-{{ .Values.proxyService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.proxyService.name}}
+    app.kubernetes.io/name: {{ .Values.proxyService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.proxyService.name}}
+      app.kubernetes.io/name: {{ .Values.proxyService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.proxyService.deployment.strategy.type}}
+    type: {{ .Values.proxyService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.proxyService.name}}
+        app.kubernetes.io/name: {{ .Values.proxyService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
-      serviceAccountName: {{.Values.proxyService.serviceAccount.name}}
+      serviceAccountName: {{ .Values.proxyService.serviceAccount.name }}
       containers:
-        - name: {{.Values.proxyService.name}}
-          image: {{.Values.proxyService.deployment.container.image.repository}}:{{.Values.proxyService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.statusService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.proxyService.name }}
+          image: {{ .Values.proxyService.deployment.container.image.repository }}:{{ .Values.proxyService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.statusService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.proxyService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.proxyService.deployment.container.ports.containerPort }}
           env:
             - name: SERVER_PORT
               value: {{ quote .Values.proxyService.deployment.container.env.SERVER_PORT }}
             - name: OPENTRACING_JAEGER_ENABLED
               value: {{ quote .Values.proxyService.deployment.container.env.OPENTRACING_JAEGER_ENABLED }}
             - name: JAEGER_SERVICE_NAME
-              value: {{quote (printf "unguard-%s" .Values.proxyService.name) }}
+              value: {{ quote (printf "unguard-%s" .Values.proxyService.name) }}
             - name: JAEGER_AGENT_HOST
               value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.proxyService.deployment.container.env.JAEGER_AGENT_HOST) }}
             - name: JAEGER_SAMPLER_TYPE
diff --git a/chart/templates/status-service.yaml b/chart/templates/status-service.yaml
index 78bbc984..6157972e 100644
--- a/chart/templates/status-service.yaml
+++ b/chart/templates/status-service.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.statusService.name}}
+  name: unguard-{{ .Values.statusService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.statusService.name}}
+    app.kubernetes.io/name: {{ .Values.statusService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
-  type: {{.Values.statusService.service.type}}
+  type: {{ .Values.statusService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.statusService.name}}
+    app.kubernetes.io/name: {{ .Values.statusService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.statusService.service.ports | toYaml | nindent 4 }}
@@ -34,9 +34,9 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{.Values.statusService.serviceAccount.name}}
+  name: {{ .Values.statusService.serviceAccount.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.statusService.name}}
+    app.kubernetes.io/name: {{ .Values.statusService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 
@@ -44,60 +44,60 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{.Values.statusService.role.name}}
+  name: {{ .Values.statusService.role.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.statusService.name}}
+    app.kubernetes.io/name: {{ .Values.statusService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 rules:
-  {{- .Values.statusService.role.rules | toYaml | nindent 2}}
+  {{- .Values.statusService.role.rules | toYaml | nindent 2 }}
 
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{.Values.statusService.roleBindings.name}}
+  name: {{ .Values.statusService.roleBindings.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.statusService.name}}
+    app.kubernetes.io/name: {{ .Values.statusService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 subjects:
-  {{- .Values.statusService.roleBindings.subjects | toYaml | nindent 2}}
+  {{- .Values.statusService.roleBindings.subjects | toYaml | nindent 2 }}
 roleRef:
-  kind: {{.Values.statusService.roleBindings.roleRef.kind}}
-  name: {{.Values.statusService.roleBindings.roleRef.name}}
-  apiGroup: {{.Values.statusService.roleBindings.roleRef.apiGroup}}
+  kind: {{ .Values.statusService.roleBindings.roleRef.kind }}
+  name: {{ .Values.statusService.roleBindings.roleRef.name }}
+  apiGroup: {{ .Values.statusService.roleBindings.roleRef.apiGroup }}
 
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.statusService.name}}
+  name: unguard-{{ .Values.statusService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.statusService.name}}
+    app.kubernetes.io/name: {{ .Values.statusService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.statusService.name}}
+      app.kubernetes.io/name: {{ .Values.statusService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.statusService.deployment.strategy.type}}
+    type: {{ .Values.statusService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.statusService.name}}
+        app.kubernetes.io/name: {{ .Values.statusService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
-      serviceAccountName: {{.Values.statusService.serviceAccount.name}}
+      serviceAccountName: {{ .Values.statusService.serviceAccount.name }}
       containers:
-        - name: {{.Values.statusService.name}}
-          image: {{.Values.statusService.deployment.container.image.repository}}:{{.Values.statusService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.statusService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.statusService.name }}
+          image: {{ .Values.statusService.deployment.container.image.repository }}:{{ .Values.statusService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.statusService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.statusService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.statusService.deployment.container.ports.containerPort }}
           env:
             - name: SERVER_PORT
               value: {{ quote .Values.statusService.deployment.container.env.SERVER_PORT }}
diff --git a/chart/templates/tests/test-frontend-connection.yaml b/chart/templates/tests/test-frontend-connection.yaml
index 6cd19175..cf04cdbd 100644
--- a/chart/templates/tests/test-frontend-connection.yaml
+++ b/chart/templates/tests/test-frontend-connection.yaml
@@ -9,14 +9,14 @@ metadata:
     "helm.sh/hook": test
 spec:
   containers:
-    - name: unguard-{{.Values.userSimulator.name}}
-      image: {{.Values.userSimulator.cronJob.jobTemplate.container.image.repository}}:{{.Values.userSimulator.cronJob.jobTemplate.container.image.tag}}
-      imagePullPolicy: {{.Values.userSimulator.cronJob.jobTemplate.container.image.pullPolicy}}
+    - name: unguard-{{ .Values.userSimulator.name }}
+      image: {{ .Values.userSimulator.cronJob.jobTemplate.container.image.repository }}:{{ .Values.userSimulator.cronJob.jobTemplate.container.image.tag }}
+      imagePullPolicy: {{ .Values.userSimulator.cronJob.jobTemplate.container.image.pullPolicy }}
       env:
         - name: FRONTEND_ADDR
-          value: {{quote .Values.userSimulator.cronJob.jobTemplate.container.env.FRONTEND_ADDR}}
+          value: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.env.FRONTEND_ADDR }}
         - name: SIMULATE_PRIVATE_RANGES
-          value: {{quote .Values.userSimulator.cronJob.jobTemplate.container.env.SIMULATE_PRIVATE_RANGES}}
+          value: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.env.SIMULATE_PRIVATE_RANGES }}
       command: ["/bin/sh"]
       args: ["-c", "node_modules/.bin/element run default-user-sim.perf.ts --export 2>&1 && jq -e '.testScripts[].iterationResults[].stepResults[] | select(.status == \"failed\") | .name' reports/default-user-sim.perf/*/data.json >/dev/null && exit 1 || exit 0"]
   restartPolicy: Never
diff --git a/chart/templates/user-auth-service.yaml b/chart/templates/user-auth-service.yaml
index d51f37f8..2450e834 100644
--- a/chart/templates/user-auth-service.yaml
+++ b/chart/templates/user-auth-service.yaml
@@ -17,15 +17,15 @@ limitations under the License.
 apiVersion: v1
 kind: Service
 metadata:
-  name: unguard-{{.Values.userAuthService.name}}
+  name: unguard-{{ .Values.userAuthService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.userAuthService.name}}
+    app.kubernetes.io/name: {{ .Values.userAuthService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   type: {{ .Values.userAuthService.service.type }}
   selector:
-    app.kubernetes.io/name: {{.Values.userAuthService.name}}
+    app.kubernetes.io/name: {{ .Values.userAuthService.name }}
     app.kubernetes.io/part-of: unguard
   ports:
  {{- .Values.userAuthService.service.ports | toYaml | nindent 4 }}
@@ -34,31 +34,31 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: unguard-{{.Values.userAuthService.name}}
+  name: unguard-{{ .Values.userAuthService.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.userAuthService.name}}
+    app.kubernetes.io/name: {{ .Values.userAuthService.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{.Values.userAuthService.name}}
+      app.kubernetes.io/name: {{ .Values.userAuthService.name }}
       app.kubernetes.io/part-of: unguard
   strategy:
-    type: {{.Values.userAuthService.deployment.strategy.type}}
+    type: {{ .Values.userAuthService.deployment.strategy.type }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{.Values.userAuthService.name}}
+        app.kubernetes.io/name: {{ .Values.userAuthService.name }}
         app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 8 }}
     spec:
       containers:
-        - name: {{.Values.userAuthService.name}}
-          image: {{.Values.userAuthService.deployment.container.image.repository}}:{{.Values.userAuthService.deployment.container.image.tag}}
-          imagePullPolicy: {{.Values.userAuthService.deployment.container.image.pullPolicy}}
+        - name: {{ .Values.userAuthService.name }}
+          image: {{ .Values.userAuthService.deployment.container.image.repository }}:{{ .Values.userAuthService.deployment.container.image.tag }}
+          imagePullPolicy: {{ .Values.userAuthService.deployment.container.image.pullPolicy }}
           ports:
-            - containerPort: {{.Values.userAuthService.deployment.container.ports.containerPort}}
+            - containerPort: {{ .Values.userAuthService.deployment.container.ports.containerPort }}
           env:
             - name: SERVER_PORT
               value: {{ quote .Values.userAuthService.deployment.container.env.SERVER_PORT }}
@@ -70,9 +70,9 @@ spec:
                   name: {{ tpl .Values.userAuthService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.name . }}
                   key: {{ tpl .Values.userAuthService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.key .  }}
             - name: JAEGER_SERVICE_NAME
-              value: {{quote (printf "unguard-%s" .Values.userAuthService.name) }}
+              value: {{ quote (printf "unguard-%s" .Values.userAuthService.name) }}
             - name: JAEGER_AGENT_HOST
-              value: {{quote (printf "%s-%s" .Values.jaeger.name .Values.userAuthService.deployment.container.env.JAEGER_AGENT_HOST) }}
+              value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.userAuthService.deployment.container.env.JAEGER_AGENT_HOST) }}
             - name: JAEGER_SAMPLER_TYPE
               value: {{ quote .Values.userAuthService.deployment.container.env.JAEGER_SAMPLER_TYPE }}
             - name: JAEGER_SAMPLER_PARAM
diff --git a/chart/templates/user-simulator.yaml b/chart/templates/user-simulator.yaml
index 2c692850..9e3d66a8 100644
--- a/chart/templates/user-simulator.yaml
+++ b/chart/templates/user-simulator.yaml
@@ -17,37 +17,37 @@ limitations under the License.
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: unguard-{{.Values.userSimulator.name}}
+  name: unguard-{{ .Values.userSimulator.name }}
   labels:
-    app.kubernetes.io/name: {{.Values.userSimulator.name}}
+    app.kubernetes.io/name: {{ .Values.userSimulator.name }}
     app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 4 }}
 spec:
-  schedule: {{quote .Values.userSimulator.cronJob.schedule}}
-  startingDeadlineSeconds: {{ .Values.userSimulator.cronJob.startingDeadlineSeconds}}
+  schedule: {{ quote .Values.userSimulator.cronJob.schedule }}
+  startingDeadlineSeconds: {{ .Values.userSimulator.cronJob.startingDeadlineSeconds }}
   jobTemplate:
     spec:
       template:
         metadata:
           labels:
-            app.kubernetes.io/name: {{.Values.userSimulator.name}}
+            app.kubernetes.io/name: {{ .Values.userSimulator.name }}
             app.kubernetes.io/part-of: unguard
 {{ include "renderLabels" .Values.labels.common | indent 12 }}
         spec:
-          restartPolicy: {{.Values.userSimulator.cronJob.jobTemplate.restartPolicy}}
+          restartPolicy: {{ .Values.userSimulator.cronJob.jobTemplate.restartPolicy }}
           containers:
-            - name: unguard-{{.Values.userSimulator.name}}
-              image: {{.Values.userSimulator.cronJob.jobTemplate.container.image.repository}}:{{.Values.userSimulator.cronJob.jobTemplate.container.image.tag}}
-              imagePullPolicy: {{.Values.userSimulator.cronJob.jobTemplate.container.image.pullPolicy}}
+            - name: unguard-{{ .Values.userSimulator.name }}
+              image: {{ .Values.userSimulator.cronJob.jobTemplate.container.image.repository }}:{{ .Values.userSimulator.cronJob.jobTemplate.container.image.tag }}
+              imagePullPolicy: {{ .Values.userSimulator.cronJob.jobTemplate.container.image.pullPolicy }}
               env:
                 - name: FRONTEND_ADDR
-                  value: {{quote .Values.userSimulator.cronJob.jobTemplate.container.env.FRONTEND_ADDR}}
+                  value: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.env.FRONTEND_ADDR }}
                 - name: SIMULATE_PRIVATE_RANGES
-                  value: {{quote .Values.userSimulator.cronJob.jobTemplate.container.env.SIMULATE_PRIVATE_RANGES}}
+                  value: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.env.SIMULATE_PRIVATE_RANGES }}
               resources:
                 requests:
-                  cpu: {{quote .Values.userSimulator.cronJob.jobTemplate.container.resources.requests.cpu}}
-                  memory: {{quote .Values.userSimulator.cronJob.jobTemplate.container.resources.requests.memory}}
+                  cpu: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.resources.requests.cpu }}
+                  memory: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.resources.requests.memory }}
                 limits:
-                  cpu: {{quote .Values.userSimulator.cronJob.jobTemplate.container.resources.limits.cpu}}
-                  memory: {{quote .Values.userSimulator.cronJob.jobTemplate.container.resources.limits.memory}}
+                  cpu: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.resources.limits.cpu }}
+                  memory: {{ quote .Values.userSimulator.cronJob.jobTemplate.container.resources.limits.memory }}