diff --git a/packages/linkerd/linkerd-control-plane/overlay/app-readme.md b/packages/linkerd/linkerd-control-plane/overlay/app-readme.md
index 0bf758574..351eac5f0 100644
--- a/packages/linkerd/linkerd-control-plane/overlay/app-readme.md
+++ b/packages/linkerd/linkerd-control-plane/overlay/app-readme.md
@@ -4,6 +4,11 @@ Linkerd is an ultra light, ultra simple, ultra powerful service mesh. Linkerd
 adds security, observability, and reliability to Kubernetes, without the
 complexity.
 
-This particular chart only installs the control plane core. To gain access to
-the observability features, please install the linkerd-viz chart. Other
-extensions are available (multicluster, jaeger) under the linkerd Helm repo.
+This particular Helm chart only installs the control plane core. You will also need to install the
+linkerd-crds chart. This chart should be automatically installed along with any other dependencies.
+If it is not installed as a dependency, install it first.
+
+To gain access to the observability features, please install the linkerd-viz chart.
+Other extensions are available (multicluster, jaeger) under the linkerd Helm repo.
+
+Full documentation available at: https://linkerd.io/2/overview/
diff --git a/packages/linkerd/linkerd-control-plane/overlay/questions.yaml b/packages/linkerd/linkerd-control-plane/overlay/questions.yaml
index a58084d05..4ae27870a 100644
--- a/packages/linkerd/linkerd-control-plane/overlay/questions.yaml
+++ b/packages/linkerd/linkerd-control-plane/overlay/questions.yaml
@@ -17,9 +17,3 @@ questions:
   required: true
   type: multiline
   group: Identity
-- variable: identity.issuer.crtExpiry
-  label: "Expiration timestamp for the issuer certificate"
-  description: "This must match the expiry date in crtPEM"
-  required: true
-  type: string
-  group: Identity
diff --git a/packages/linkerd/linkerd-control-plane/upstream.yaml b/packages/linkerd/linkerd-control-plane/upstream.yaml
index 724942478..a284fac24 100644
--- a/packages/linkerd/linkerd-control-plane/upstream.yaml
+++ b/packages/linkerd/linkerd-control-plane/upstream.yaml
@@ -1,4 +1,5 @@
-HelmRepo: https://helm.linkerd.io/stable
+HelmRepo: https://helm.linkerd.io/edge
 HelmChart: linkerd-control-plane
 Vendor: Linkerd
 DisplayName: Linkerd Control Plane
+AutoInstall: linkerd-crds
diff --git a/packages/linkerd/linkerd-crds/overlay/app-readme.md b/packages/linkerd/linkerd-crds/overlay/app-readme.md
new file mode 100644
index 000000000..59010a6b2
--- /dev/null
+++ b/packages/linkerd/linkerd-crds/overlay/app-readme.md
@@ -0,0 +1,9 @@
+# Linkerd 2 CRDs Chart
+
+Linkerd is an ultra light, ultra simple, ultra powerful service mesh. Linkerd
+adds security, observability, and reliability to Kubernetes, without the
+complexity.
+
+This particular Helm chart only installs Linkerd CRDs.
+
+Full documentation available at: https://linkerd.io/2/overview/
diff --git a/packages/linkerd/linkerd-crds/upstream.yaml b/packages/linkerd/linkerd-crds/upstream.yaml
new file mode 100644
index 000000000..e76a8164a
--- /dev/null
+++ b/packages/linkerd/linkerd-crds/upstream.yaml
@@ -0,0 +1,4 @@
+HelmRepo: https://helm.linkerd.io/edge
+HelmChart: linkerd-crds
+Vendor: Linkerd
+DisplayName: Linkerd CRDs