diff --git a/charts/t8s-cluster/README.md.gotmpl b/charts/t8s-cluster/README.md.gotmpl
index 30d53213c..c31dbd4ac 100644
--- a/charts/t8s-cluster/README.md.gotmpl
+++ b/charts/t8s-cluster/README.md.gotmpl
@@ -34,4 +34,8 @@ delete the cloud-config secret, as these will just be recreated during installat
 
 Just skip version 6.x.x, as there was a mistake and it has been reverted.
 
+### 7.x.x -> 8.x.x
+
+Removed the unused `.metadata.gopassName` field.
+
 {{ .Files.Get "values.md"  }}
diff --git a/charts/t8s-cluster/templates/management-cluster/cluster.yaml b/charts/t8s-cluster/templates/management-cluster/cluster.yaml
index a27607f70..5d8b7ffd7 100644
--- a/charts/t8s-cluster/templates/management-cluster/cluster.yaml
+++ b/charts/t8s-cluster/templates/management-cluster/cluster.yaml
@@ -10,7 +10,6 @@ metadata:
   annotations:
     t8s.teuto.net/cluster_support_project_url: {{ .Values.metadata.supportProjectUrl | quote}}
     t8s.teuto.net/cluster_config_group_url: {{ .Values.metadata.configGroupUrl | quote }}
-    t8s.teuto.net/gopass_name: {{ .Values.metadata.gopassName | quote }}
     t8s.teuto.net/remarks: {{ .Values.metadata.remarks | quote }}
 spec:
   customerID: {{ .Values.metadata.customerID }}
diff --git a/charts/t8s-cluster/values.schema.json b/charts/t8s-cluster/values.schema.json
index 23481e1f5..e306712cb 100644
--- a/charts/t8s-cluster/values.schema.json
+++ b/charts/t8s-cluster/values.schema.json
@@ -101,9 +101,6 @@
         "configGroupUrl": {
           "type": "string"
         },
-        "gopassName": {
-          "type": "string"
-        },
         "remarks": {
           "type": "string"
         }
diff --git a/charts/t8s-cluster/values.yaml b/charts/t8s-cluster/values.yaml
index 1887b0bff..2119a8dbd 100644
--- a/charts/t8s-cluster/values.yaml
+++ b/charts/t8s-cluster/values.yaml
@@ -39,7 +39,6 @@ metadata:
   serviceLevelAgreement: None
   supportProjectUrl: ""
   configGroupUrl: ""
-  gopassName: ""
   remarks: ""
   friendlyName: ""