diff --git a/charts/linkerd2/Chart.yaml b/charts/linkerd2/Chart.yaml
index 6d3b8b6d05c9e..5630436730afb 100644
--- a/charts/linkerd2/Chart.yaml
+++ b/charts/linkerd2/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: "v1"
-appVersion: stable-2.4.0
+appVersion: edge-19.8.1
 description: Linkerd gives you observability, reliability, and security for your microservices — with no code change required.
 home: https://linkerd.io
 keywords:
diff --git a/charts/linkerd2/templates/controller.yaml b/charts/linkerd2/templates/controller.yaml
index ef846573792aa..9e2d85b5f2956 100644
--- a/charts/linkerd2/templates/controller.yaml
+++ b/charts/linkerd2/templates/controller.yaml
@@ -72,7 +72,7 @@ spec:
         {{.ControllerNamespaceLabel}}: {{.Namespace}}
         {{- include "partials.proxy.labels" .Proxy | nindent 8}}
     spec:
-      {{- if eq .EnablePodAntiAffinity true -}}
+      {{- if .EnablePodAntiAffinity -}}
       {{- $local := dict "Component" "controller" "Label" .ControllerComponentLabel -}}
       {{- include "linkerd.pod-affinity" $local | nindent 6 -}}
       {{- end }}
diff --git a/charts/linkerd2/templates/tap.yaml b/charts/linkerd2/templates/tap.yaml
index 96e92af558a33..7468e2f1ba8a6 100644
--- a/charts/linkerd2/templates/tap.yaml
+++ b/charts/linkerd2/templates/tap.yaml
@@ -57,7 +57,8 @@ spec:
         {{- include "partials.proxy.labels" .Proxy | nindent 8}}
     spec:
       {{- if .EnablePodAntiAffinity -}}
-      {{- include "linkerd.pod-affinity" . | nindent 6 -}}
+      {{- $local := dict "Component" "tap" "Label" .ControllerComponentLabel -}}
+      {{- include "linkerd.pod-affinity" $local | nindent 6 -}}
       {{- end }}
       containers:
       - args:
diff --git a/charts/linkerd2/values.yaml b/charts/linkerd2/values.yaml
index c5b837e648644..be57b65ce8abd 100644
--- a/charts/linkerd2/values.yaml
+++ b/charts/linkerd2/values.yaml
@@ -8,7 +8,7 @@ EnablePodAntiAffinity: false
 ImagePullPolicy: &image_pull_policy IfNotPresent
 
 # control plane version. See Proxy section for proxy version
-LinkerdVersion: &linkerd_version stable-2.4.0
+LinkerdVersion: &linkerd_version edge-19.8.1
 
 Namespace: linkerd
 OmitWebhookSideEffects: false