diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index aeab116..fb2e3b7 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -29,4 +29,4 @@ spec:
       volumes:
         - name: data
           persistentVolumeClaim:
-            claimName: my-app
+            claimName: {{ .Release.Name }}
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index fa00b16..6c89ba8 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -2,9 +2,8 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}
-  annotations:
-    kubernetes.io/ingress.class: nginx
 spec:
+  ingressClassName: nginx
   rules:
     - host: {{ .Values.ingress.host }}
       http:
@@ -13,6 +12,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: my-app
-                port: 
+                name: {{ .Release.Name }}
+                port:
                   number: 80