diff --git a/charts/nebulous-cloud-fog-service-broker/templates/deployment-postgres.yaml b/charts/nebulous-cloud-fog-service-broker/templates/deployment-postgres.yaml
index 1acb03b..b8e1f06 100644
--- a/charts/nebulous-cloud-fog-service-broker/templates/deployment-postgres.yaml
+++ b/charts/nebulous-cloud-fog-service-broker/templates/deployment-postgres.yaml
@@ -40,6 +40,18 @@ spec:
               mountPath: /var/lib/postgresql/data/
             - name: init-script
               mountPath: /docker-entrypoint-initdb.d
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 
 
 ---
diff --git a/charts/nebulous-cloud-fog-service-broker/templates/frontend.yaml b/charts/nebulous-cloud-fog-service-broker/templates/frontend.yaml
index 245806c..9d6184a 100644
--- a/charts/nebulous-cloud-fog-service-broker/templates/frontend.yaml
+++ b/charts/nebulous-cloud-fog-service-broker/templates/frontend.yaml
@@ -26,6 +26,18 @@ spec:
               value: {{ .Values.env.backendHost }}
             - name: VITE_BACKEND_URL
               value: {{ .Values.env.backendHost }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service