diff --git a/aidbox/Chart.yaml b/aidbox/Chart.yaml
index 015f9f4..b56a258 100644
--- a/aidbox/Chart.yaml
+++ b/aidbox/Chart.yaml
@@ -5,4 +5,4 @@ home: https://www.health-samurai.io/aidbox
 icon: https://aidbox.github.io/helm-charts/icon.png?1712669999
 name: aidbox
 type: application
-version: 0.1.16
+version: 0.1.17
diff --git a/aidbox/README.md b/aidbox/README.md
index deabb56..21421d2 100644
--- a/aidbox/README.md
+++ b/aidbox/README.md
@@ -2,7 +2,7 @@
 
 [Aidbox](https://docs.aidbox.app/) is an efficient and scalable FHIR server built to handle healthcare data effectively, empowering healthcare providers and developers alike with its comprehensive platform for storing, accessing, and exchanging healthcare information in accordance with FHIR standards.
 
-![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
+![Version: 0.1.17](https://img.shields.io/badge/Version-0.1.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
 
 ## Installation
 
@@ -40,6 +40,7 @@ It will install the Aidbox in the `aidbox` namespace, creating that namespace if
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| affinity | object | `{}` |  |
 | autoscaling.enabled | bool | `false` |  |
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
@@ -85,6 +86,7 @@ It will install the Aidbox in the `aidbox` namespace, creating that namespace if
 | startupProbe.httpGet.port | string | `"api"` |  |
 | startupProbe.initialDelaySeconds | int | `20` |  |
 | startupProbe.periodSeconds | int | `5` |  |
+| tolerations | list | `[]` |  |
 | updateStrategy.type | string | `"RollingUpdate"` |  |
 | volumeMounts | list | `[]` |  |
 | volumes | list | `[]` |  |
diff --git a/aidbox/templates/deployment.yaml b/aidbox/templates/deployment.yaml
index 4c4b6f3..e89826e 100644
--- a/aidbox/templates/deployment.yaml
+++ b/aidbox/templates/deployment.yaml
@@ -67,6 +67,10 @@ spec:
       volumes:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- else }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -76,5 +80,10 @@ spec:
                   matchLabels:
                     {{- include "aidbox.selectorLabels" . | nindent 20 }}
                 topologyKey: "kubernetes.io/hostname"
+      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/aidbox/values.yaml b/aidbox/values.yaml
index ca045a1..1e7eb42 100644
--- a/aidbox/values.yaml
+++ b/aidbox/values.yaml
@@ -105,6 +105,9 @@ extraEnvFromSecrets: []
 serviceAccount:
   # -- ServiceAccount to use
   name: ""
-  
+
 updateStrategy:
   type: RollingUpdate
+
+affinity: {}
+tolerations: []