diff --git a/charts/argo/templates/cronworkflow-crd.yaml b/charts/argo/templates/cronworkflow-crd.yaml
new file mode 100644
index 00000000..34df4bb8
--- /dev/null
+++ b/charts/argo/templates/cronworkflow-crd.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.installCRD }}
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: cronworkflows.argoproj.io
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Namespaced
+  names:
+    kind: CronWorkflow
+    plural: cronworkflows
+    shortNames:
+      - cronwf
+      - cwf
+{{- end }}
diff --git a/charts/argo/templates/workflow-crd.yaml b/charts/argo/templates/workflow-crd.yaml
index bada1925..06c1dae0 100644
--- a/charts/argo/templates/workflow-crd.yaml
+++ b/charts/argo/templates/workflow-crd.yaml
@@ -3,10 +3,17 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: workflows.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.phase
+    description: Status of the workflow
+    name: Status
+    type: string
+  - JSONPath: .status.startedAt
+    description: When the workflow was started
+    name: Age
+    format: date-time
+    type: date
   group: argoproj.io
   version: v1alpha1
   scope: Namespaced
diff --git a/charts/argo/templates/workflow-template-crd.yaml b/charts/argo/templates/workflow-template-crd.yaml
index 55c940d5..476e6d06 100644
--- a/charts/argo/templates/workflow-template-crd.yaml
+++ b/charts/argo/templates/workflow-template-crd.yaml
@@ -3,9 +3,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: workflowtemplates.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
 spec:
   group: argoproj.io
   version: v1alpha1
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 59653770..c8719de7 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -6,8 +6,6 @@ images:
   pullPolicy: Always
   tag: v2.5.2
 
-crdVersion: v1alpha1
-
 # Note: For Helm3 this should be set to False
 # the crds/ folder contains the necessary crds and will install them
 installCRD: true