diff --git a/helm-chart/eoapi/templates/pgstacboostrap/job.yaml b/helm-chart/eoapi/templates/pgstacboostrap/job.yaml
index e2110b75..f70927ce 100644
--- a/helm-chart/eoapi/templates/pgstacboostrap/job.yaml
+++ b/helm-chart/eoapi/templates/pgstacboostrap/job.yaml
@@ -51,5 +51,13 @@ spec:
         - name: pgstac-setup-volume-{{ $.Release.Name }}
           configMap:
             name: pgstac-setup-config-{{ $.Release.Name }}
+      {{- with .Values.pgstacBootstrap.settings.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pgstacBootstrap.settings.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
   backoffLimit: 1
 {{- end }}
diff --git a/helm-chart/eoapi/templates/services/deployment.yaml b/helm-chart/eoapi/templates/services/deployment.yaml
index c74e0bb0..bc814097 100644
--- a/helm-chart/eoapi/templates/services/deployment.yaml
+++ b/helm-chart/eoapi/templates/services/deployment.yaml
@@ -71,6 +71,14 @@ spec:
             name: {{ $secret }}
         {{- end }}
         {{- end }}
+      {{- with index $v "settings" "affinity" }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with index $v "settings" "tolerations" }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 ---
 {{/* END: if index $v "enabled" */}}
 {{- end }}
diff --git a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml
index ed626d33..ac8d9c99 100644
--- a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml
+++ b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml
@@ -46,6 +46,14 @@ spec:
       - name: doc-html-{{ .Release.Name }}
         configMap:
           name: nginx-root-html-{{ .Release.Name }}
+      {{- with .Values.docServer.settings.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.docServer.settings.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service
@@ -59,4 +67,4 @@ spec:
       port: 80
       targetPort: 80
 ---
-{{- end }}
\ No newline at end of file
+{{- end }}