diff --git a/charts/ace/README.md b/charts/ace/README.md
index 786d4ba47..db0c1a929 100644
--- a/charts/ace/README.md
+++ b/charts/ace/README.md
@@ -125,7 +125,7 @@ The following table lists the configurable parameters of the `ace` chart and the
 | global.infra.badger.mountPath                        |                                                                                                                                                                                                                                                | <code>/badger</code>                                                                                                                                                                           |
 | global.infra.badger.levels                           |                                                                                                                                                                                                                                                | <code>7</code>                                                                                                                                                                                 |
 | global.infra.invoice.mountPath                       |                                                                                                                                                                                                                                                | <code>/billing</code>                                                                                                                                                                          |
-| global.infra.invoice.bucket                          |                                                                                                                                                                                                                                                | <code></code>                                                                                                                                                                                  |
+| global.infra.invoice.bucket                          |                                                                                                                                                                                                                                                | <code>""</code>                                                                                                                                                                                |
 | global.infra.invoice.prefix                          |                                                                                                                                                                                                                                                | <code>""</code>                                                                                                                                                                                |
 | global.infra.invoice.trackerEmail                    |                                                                                                                                                                                                                                                | <code>invoice-tracker@appscode.com</code>                                                                                                                                                      |
 | global.infra.fileserver.baseURL                      |                                                                                                                                                                                                                                                | <code>""</code>                                                                                                                                                                                |
diff --git a/charts/ace/values.yaml b/charts/ace/values.yaml
index 1c9e248c5..8f6c4b954 100644
--- a/charts/ace/values.yaml
+++ b/charts/ace/values.yaml
@@ -268,7 +268,7 @@ global:
       levels: 7
     invoice:
       mountPath: /billing
-      bucket:
+      bucket: ""
       prefix: ""
       trackerEmail: invoice-tracker@appscode.com
     fileserver:
diff --git a/charts/billing/templates/processor/statefulset.yaml b/charts/billing/templates/processor/statefulset.yaml
index 400b20ffe..b18852ff0 100644
--- a/charts/billing/templates/processor/statefulset.yaml
+++ b/charts/billing/templates/processor/statefulset.yaml
@@ -182,9 +182,20 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- if .Values.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- else }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app.kubernetes.io/component: "processor"
+                    {{- include "billing.selectorLabels" . | nindent 20 }}
+                topologyKey: kubernetes.io/hostname
       {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
diff --git a/charts/platform-api/templates/statefulset.yaml b/charts/platform-api/templates/statefulset.yaml
index ed30edcc2..f1a08d28c 100644
--- a/charts/platform-api/templates/statefulset.yaml
+++ b/charts/platform-api/templates/statefulset.yaml
@@ -262,9 +262,19 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- if .Values.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- else }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    {{- include "platform-api.selectorLabels" . | nindent 20 }}
+                topologyKey: kubernetes.io/hostname
       {{- end }}
       {{- with .Values.tolerations }}
       tolerations: