diff --git a/docs/content/install.md b/docs/content/install.md
index 303d0ef4b..f5d11d02c 100644
--- a/docs/content/install.md
+++ b/docs/content/install.md
@@ -103,9 +103,6 @@ pod/maesh-controller-676fb86b89-pj8ph   1/1     Running   0          11s
 pod/maesh-mesh-w62z5                    1/1     Running   0          11s
 pod/maesh-mesh-zjlpf                    1/1     Running   0          11s
 
-NAME                     TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)    AGE
-service/maesh-mesh-api   ClusterIP   100.69.177.254   <none>        8080/TCP   29s
-
 NAME                        DESIRED   CURRENT   READY   UP-TO-DATE   AVAILABLE   NODE SELECTOR   AGE
 daemonset.apps/maesh-mesh   2         2         0       2            0           <none>          29s
 
diff --git a/helm/chart/maesh/templates/controller/controller-deployment.yaml b/helm/chart/maesh/templates/controller/controller-deployment.yaml
index c1eedf807..21298ca75 100644
--- a/helm/chart/maesh/templates/controller/controller-deployment.yaml
+++ b/helm/chart/maesh/templates/controller/controller-deployment.yaml
@@ -28,22 +28,9 @@ spec:
         prometheus.io/port: "4646"
     spec:
       serviceAccountName: maesh-controller
-      automountServiceAccountToken: true
       securityContext:
         runAsNonRoot: true
         runAsUser: 999
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 100
-              podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                    - key: component
-                      operator: In
-                      values:
-                        - controller
-                topologyKey: "kubernetes.io/hostname"
       {{- if .Values.controller.image.pullSecret }}
       imagePullSecrets:
         - name: {{ .Values.controller.image.pullSecret }}
diff --git a/helm/chart/maesh/templates/controller/controller-sa.yaml b/helm/chart/maesh/templates/controller/controller-sa.yaml
index d64f8bd95..4121659f9 100644
--- a/helm/chart/maesh/templates/controller/controller-sa.yaml
+++ b/helm/chart/maesh/templates/controller/controller-sa.yaml
@@ -10,3 +10,4 @@ metadata:
     chart: {{ include "maesh.chartLabel" . | quote}}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
+automountServiceAccountToken: true
diff --git a/helm/chart/maesh/templates/mesh/mesh-pdb.yaml b/helm/chart/maesh/templates/mesh/mesh-pdb.yaml
deleted file mode 100644
index 22c17d5b7..000000000
--- a/helm/chart/maesh/templates/mesh/mesh-pdb.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: maesh-mesh
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: maesh
-    component: maesh-mesh
-    chart: {{ include "maesh.chartLabel" . | quote }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-spec:
-  maxUnavailable: 1
-  selector:
-    matchLabels:
-      app: maesh
-      component: maesh-mesh
-      release: {{ .Release.Name | quote }}
diff --git a/helm/chart/maesh/templates/mesh/mesh-service.yaml b/helm/chart/maesh/templates/mesh/mesh-service.yaml
deleted file mode 100644
index b5f8daef4..000000000
--- a/helm/chart/maesh/templates/mesh/mesh-service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: maesh-mesh-api
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: maesh
-    component: maesh-mesh
-spec:
-  type: ClusterIP
-  ports:
-    - port: 8080
-      name: mesh-api
-      targetPort: api
-  selector:
-    app: maesh
-    component: maesh-mesh
-    release: {{ .Release.Name | quote }}