diff --git a/ops/helm-charts/metrics-calculation-service/Chart.yaml b/ops/helm-charts/metrics-calculation-service/Chart.yaml
index 845804c5..99cca7c4 100644
--- a/ops/helm-charts/metrics-calculation-service/Chart.yaml
+++ b/ops/helm-charts/metrics-calculation-service/Chart.yaml
@@ -3,5 +3,5 @@ name: metrics-calculation-service
 description: The metrics calculation service
 
 type: application
-version: 0.8.2
+version: 0.9.0
 appVersion: 0.1.0
\ No newline at end of file
diff --git a/ops/helm-charts/metrics-calculation-service/templates/app.yaml b/ops/helm-charts/metrics-calculation-service/templates/app.yaml
index a37c0c49..357c6cc3 100644
--- a/ops/helm-charts/metrics-calculation-service/templates/app.yaml
+++ b/ops/helm-charts/metrics-calculation-service/templates/app.yaml
@@ -17,6 +17,18 @@ spec:
         {{- include "mcs.selectorLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "mcs.fullname" . }}
+      {{- with .Values.mcs.frontend.affinity }}
+      affinity:
+        {{ toYaml . | nindent 12 }}
+      {{- end }}
+      {{- with .Values.mcs.frontend.nodeSelector }}
+      nodeSelector:
+        {{ toYaml . | nindent 12 }}
+      {{- end }}
+      {{- with .Values.mcs.frontend.tolerations }}
+      tolerations:
+        {{ toYaml . | nindent 12 }}
+      {{- end }}
       containers:
       - name: metrics-calculation-service
         image: {{ .Values.mcs.image.repo }}:{{ .Values.mcs.image.tag }}
@@ -32,18 +44,6 @@ spec:
         imagePullPolicy: Always
         ports:
           - containerPort: 8000
-        {{- with .Values.mcs.frontend.affinity }}
-        affinity:
-          {{ toYaml . | nindent 12 }}
-        {{- end }}
-        {{- with .Values.mcs.frontend.nodeSelector }}
-        nodeSelector:
-          {{ toYaml . | nindent 12 }}
-        {{- end }}
-        {{- with .Values.mcs.frontend.tolerations }}
-        tolerations:
-          {{ toYaml . | nindent 12 }}
-        {{- end }}
         {{- with .Values.mcs.frontend.resources }}
         resources:
           {{ toYaml . | nindent 12 }}