diff --git a/devspc/devspace-apiregistry-core-service/templates/deployment.yaml b/devspc/devspace-apiregistry-core-service/templates/deployment.yaml
index 7d2b20c..ba1012b 100644
--- a/devspc/devspace-apiregistry-core-service/templates/deployment.yaml
+++ b/devspc/devspace-apiregistry-core-service/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{$.Release.Name}}-{{$.Values.name}}"
+  name: "{{$.Release.Name}}-{{$.Chart.Name}}"
   annotations:
     devspace.isb/name: {{ $.Values.repository.name | quote }}
     devspace.isb/branch: {{ $.Values.repository.branch | quote }}
@@ -10,7 +10,7 @@ metadata:
     {{- if $.Values.labels}}
     {{- toYaml $.Values.labels | nindent 4 }}
     {{- end}}
-    app.kubernetes.io/name: {{$.Values.name}}
+    app.kubernetes.io/name: {{$.Chart.Name}}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}
 spec:
@@ -23,7 +23,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{$.Values.name}}
+      app.kubernetes.io/name: {{$.Chart.Name}}
       app.kubernetes.io/instance: {{ $.Release.Name }}
   template:
     metadata:
@@ -37,7 +37,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{$.Values.name}}
+        app.kubernetes.io/name: {{$.Chart.Name}}
         app.kubernetes.io/instance: {{ $.Release.Name }}
 {{/*        app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}*/}}
     spec:
diff --git a/devspc/devspace-apiregistry-core-service/templates/ingress.yaml b/devspc/devspace-apiregistry-core-service/templates/ingress.yaml
index 1295ee8..e46cf31 100644
--- a/devspc/devspace-apiregistry-core-service/templates/ingress.yaml
+++ b/devspc/devspace-apiregistry-core-service/templates/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{$.Release.Name}}-{{$.Values.name}}
+  name: {{$.Release.Name}}-{{$.Chart.Name}}
   namespace: {{$.Release.Namespace}}
   annotations:
     traefik.ingress.kubernetes.io/router.middlewares: {{$.Release.Namespace}}-{{$.Release.Name}}-cors@kubernetescrd
diff --git a/devspc/devspace-apiregistry-core-service/templates/service.yaml b/devspc/devspace-apiregistry-core-service/templates/service.yaml
index bc2cb7d..a8c06f9 100644
--- a/devspc/devspace-apiregistry-core-service/templates/service.yaml
+++ b/devspc/devspace-apiregistry-core-service/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{$.Release.Name}}-{{$.Values.name}}"
+  name: "{{$.Release.Name}}-{{$.Chart.Name}}"
 spec:
   selector:
-    app.kubernetes.io/name: {{$.Values.name}}
+    app.kubernetes.io/name: {{$.Chart.Name}}
     app.kubernetes.io/instance: {{ $.Release.Name }}
   ports:
     - protocol: TCP
diff --git a/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml b/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml
index 67d58be..8414f86 100644
--- a/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml
+++ b/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{$.Release.Name}}-{{$.Values.name}}"
+  name: "{{$.Release.Name}}-{{$.Chart.Name}}"
   annotations:
     devspace.isb/name: {{ $.Values.repository.name | quote }}
     devspace.isb/branch: {{ $.Values.repository.branch | quote }}
@@ -10,7 +10,7 @@ metadata:
     {{- if $.Values.labels}}
     {{- toYaml $.Values.labels | nindent 4 }}
     {{- end}}
-    app.kubernetes.io/name: {{$.Values.name}}
+    app.kubernetes.io/name: {{$.Chart.Name}}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}
 spec:
@@ -23,7 +23,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{$.Values.name}}
+      app.kubernetes.io/name: {{$.Chart.Name}}
       app.kubernetes.io/instance: {{ $.Release.Name }}
   template:
     metadata:
@@ -37,7 +37,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{$.Values.name}}
+        app.kubernetes.io/name: {{$.Chart.Name}}
         app.kubernetes.io/instance: {{ $.Release.Name }}
 {{/*        app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}*/}}
     spec:
@@ -57,7 +57,7 @@ spec:
                 path: application.yaml
         - name: dependencies-data
           persistentVolumeClaim:
-            claimName: "{{$.Release.Name}}-{{$.Values.name}}-dependencies"
+            claimName: "{{$.Release.Name}}-{{$.Chart.Name}}-dependencies"
       securityContext:
         {{- toYaml $.Values.podSecurityContext | nindent 8 }}
       containers:
diff --git a/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml b/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml
index 44f15c7..ae7c503 100644
--- a/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml
+++ b/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{$.Release.Name}}-{{$.Values.name}}
+  name: {{$.Release.Name}}-{{$.Chart.Name}}
   namespace: {{$.Release.Namespace}}
 spec:
   rules:
diff --git a/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml b/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml
index 511a1a6..a1c7699 100644
--- a/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml
+++ b/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: "{{$.Release.Name}}-{{$.Values.name}}-dependencies"
+  name: "{{$.Release.Name}}-{{$.Chart.Name}}-dependencies"
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/devspc/devspace-apiregistry-generator-service/templates/service.yaml b/devspc/devspace-apiregistry-generator-service/templates/service.yaml
index bc2cb7d..a8c06f9 100644
--- a/devspc/devspace-apiregistry-generator-service/templates/service.yaml
+++ b/devspc/devspace-apiregistry-generator-service/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{$.Release.Name}}-{{$.Values.name}}"
+  name: "{{$.Release.Name}}-{{$.Chart.Name}}"
 spec:
   selector:
-    app.kubernetes.io/name: {{$.Values.name}}
+    app.kubernetes.io/name: {{$.Chart.Name}}
     app.kubernetes.io/instance: {{ $.Release.Name }}
   ports:
     - protocol: TCP