diff --git a/charts/clearml-serving/Chart.yaml b/charts/clearml-serving/Chart.yaml
index 8280d06..c1dd579 100644
--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: "1.5.4"
+version: "1.5.5"
 appVersion: "1.3.0"
 kubeVersion: ">= 1.21.0-0 < 1.30.0-0"
 home: https://clear.ml
@@ -34,4 +34,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: fixed
-      description: kubernetes 1.29 support
+      description: fixed affinity in serving templates. They need to be set on the pod and not the container.
diff --git a/charts/clearml-serving/README.md b/charts/clearml-serving/README.md
index 1b56c44..202603b 100644
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Serving
 
-![Version: 1.5.4](https://img.shields.io/badge/Version-1.5.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
+![Version: 1.5.5](https://img.shields.io/badge/Version-1.5.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
 
 ClearML Serving Helm Chart
 
diff --git a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
index 0900a96..99752e2 100644
--- a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
@@ -40,6 +40,10 @@ spec:
             name: "{{ include "clearmlServing.fullname" . }}-inference-configmap"
           {{- end }}
       {{- end }}
+      {{- with .Values.clearml_serving_inference.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - env:
             - name: CLEARML_API_ACCESS_KEY
@@ -98,10 +102,6 @@ spec:
           nodeSelector:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- with .Values.clearml_serving_inference.affinity }}
-          affinity:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           {{- with .Values.clearml_serving_inference.tolerations }}
           tolerations:
             {{- toYaml . | nindent 12 }}
diff --git a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
index 0dd1d49..59c9fc3 100644
--- a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
@@ -41,6 +41,10 @@ spec:
             name: "{{ include "clearmlServing.fullname" . }}-statistics-configmap"
           {{- end }}
       {{- end }}
+      {{- with .Values.clearml_serving_statistics.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - env:
             - name: CLEARML_API_ACCESS_KEY
@@ -83,10 +87,6 @@ spec:
           nodeSelector:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- with .Values.clearml_serving_statistics.affinity }}
-          affinity:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           {{- with .Values.clearml_serving_statistics.tolerations }}
           tolerations:
             {{- toYaml . | nindent 12 }}
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
index f91fdee..f738eee 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -44,6 +44,10 @@ spec:
             name: "{{ include "clearmlServing.fullname" . }}-triton-configmap"
           {{- end }}
       {{- end }}
+      {{- with .Values.clearml_serving_triton.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - env:
             - name: CLEARML_API_ACCESS_KEY
@@ -78,11 +82,6 @@ spec:
             - name: additional-config
               mountPath: /opt/clearml/config
           {{- end }}
-          
-          {{- with .Values.clearml_serving_triton.affinity }}
-          affinity:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           {{- with .Values.clearml_serving_triton.tolerations }}
           tolerations:
             {{- toYaml . | nindent 12 }}