diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
index b92ad8c..6a275d7 100644
--- a/charts/core/Chart.yaml
+++ b/charts/core/Chart.yaml
@@ -4,8 +4,8 @@ description: A Helm chart for deploying Unikorn Core
 
 type: application
 
-version: v0.1.85
-appVersion: v0.1.85
+version: v0.1.86
+appVersion: v0.1.86
 
 icon: https://assets.unikorn-cloud.org/images/logos/dark-on-light/icon.svg
 
diff --git a/charts/core/crds/unikorn-cloud.org_helmapplications.yaml b/charts/core/crds/unikorn-cloud.org_helmapplications.yaml
index 1f14aeb..cc1df62 100644
--- a/charts/core/crds/unikorn-cloud.org_helmapplications.yaml
+++ b/charts/core/crds/unikorn-cloud.org_helmapplications.yaml
@@ -59,12 +59,20 @@ spec:
                   under.
                 type: string
               tags:
-                description: |-
-                  Tags allows an application to be given a free-form set of labels
-                  that can provide grouping, filtering or other contexts.  For
-                  example "networking", "monitoring", "database" etc.
+                description: Tags are aribrary user data.
                 items:
-                  type: string
+                  description: Tag is an arbirary key/value.
+                  properties:
+                    name:
+                      description: Name of the tag.
+                      type: string
+                    value:
+                      description: Value of the tag.
+                      type: string
+                  required:
+                  - name
+                  - value
+                  type: object
                 type: array
               versions:
                 description: Versions are the application versions that are supported.
@@ -196,7 +204,6 @@ spec:
             - documentation
             - icon
             - license
-            - tags
             type: object
           status:
             type: object
diff --git a/pkg/apis/unikorn/v1alpha1/helmapplication_types.go b/pkg/apis/unikorn/v1alpha1/helmapplication_types.go
index 18d0135..d893f0e 100644
--- a/pkg/apis/unikorn/v1alpha1/helmapplication_types.go
+++ b/pkg/apis/unikorn/v1alpha1/helmapplication_types.go
@@ -43,16 +43,14 @@ type HelmApplication struct {
 }
 
 type HelmApplicationSpec struct {
+	// Tags are aribrary user data.
+	Tags TagList `json:"tags,omitempty"`
 	// Documentation defines a URL to 3rd party documentation.
 	Documentation *string `json:"documentation"`
 	// License describes the licence the application is released under.
 	License *string `json:"license"`
 	// Icon is a base64 encoded icon for the application.
 	Icon []byte `json:"icon"`
-	// Tags allows an application to be given a free-form set of labels
-	// that can provide grouping, filtering or other contexts.  For
-	// example "networking", "monitoring", "database" etc.
-	Tags []string `json:"tags"`
 	// Versions are the application versions that are supported.
 	Versions []HelmApplicationVersion `json:"versions,omitempty"`
 }
diff --git a/pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go
index 36b3d88..d024426 100644
--- a/pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go
@@ -213,6 +213,11 @@ func (in *HelmApplicationRecommendation) DeepCopy() *HelmApplicationRecommendati
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HelmApplicationSpec) DeepCopyInto(out *HelmApplicationSpec) {
 	*out = *in
+	if in.Tags != nil {
+		in, out := &in.Tags, &out.Tags
+		*out = make(TagList, len(*in))
+		copy(*out, *in)
+	}
 	if in.Documentation != nil {
 		in, out := &in.Documentation, &out.Documentation
 		*out = new(string)
@@ -228,11 +233,6 @@ func (in *HelmApplicationSpec) DeepCopyInto(out *HelmApplicationSpec) {
 		*out = make([]byte, len(*in))
 		copy(*out, *in)
 	}
-	if in.Tags != nil {
-		in, out := &in.Tags, &out.Tags
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 	if in.Versions != nil {
 		in, out := &in.Versions, &out.Versions
 		*out = make([]HelmApplicationVersion, len(*in))