diff --git a/charts/durpapi/templates/deployment.yaml b/charts/durpapi/templates/deployment.yaml
index 11da33c..1bd79a8 100644
--- a/charts/durpapi/templates/deployment.yaml
+++ b/charts/durpapi/templates/deployment.yaml
@@ -1,27 +1,27 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: durpapi
-  name: durpapi
+  namespace: {{ .Chart.Name }}
+  name: {{ .Chart.Name }}
   labels:
-    app: durpapi
+    app: {{ .Chart.Name }}
 spec:
   selector:
     matchLabels:
-      app: durpapi
+      app: {{ .Chart.Name }}
   replicas: {{ .Values.deployment.replicas }}
   template:
     metadata:
       labels:
-        app: durpapi
+        app: {{ .Chart.Name }}
     spec:
       containers:
-      - name: durpapi
-        image: "{{ .Values.deployment.image }}:{{ .Values.deployment.tag }}"
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.deployment.image }}:{{ default .Chart.Version .Values.deployment.tag }}"
         imagePullPolicy: {{ .Values.deployment.imagePullPolicy }}       
         ports:
         - name: http
-          containerPort: 80
+          containerPort: {{ .Values.service.port }}
         envFrom:
         - secretRef:
             name: {{ .Values.deployment.secretfile }} 
\ No newline at end of file
diff --git a/charts/durpapi/templates/ingress.yaml b/charts/durpapi/templates/ingress.yaml
index 179dc5a..204d730 100644
--- a/charts/durpapi/templates/ingress.yaml
+++ b/charts/durpapi/templates/ingress.yaml
@@ -1,31 +1,7 @@
-#apiVersion: networking.k8s.io/v1
-#kind: Ingress
-#metadata:
-#  name: durpapi-ingress
-#  annotations:
-#    kubernetes.io/ingress.class: nginx
-#    cert-manager.io/cluster-issuer: {{ .Values.ingress.clusterissuer }}
-#spec:
-#  rules:
-#  - host: {{ .Values.ingress.host }}
-#    http:
-#      paths:
-#      - path: /
-#        pathType: Prefix
-#        backend:
-#          service:
-#            name: durpapi
-#            port: 
-#              number: 80         
-#  tls:
-#    - hosts: 
-#      - {{ .Values.ingress.host }}
-#      secretName: {{ .Values.ingress.tls }}
-
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: durpapi-ingress
+  name: {{ .Chart.Name }}-ingress
 spec:
   entryPoints:
     - websecure
@@ -33,7 +9,7 @@ spec:
   - match: Host("{{ .Values.ingress.host }}") && PathPrefix(`/`)
     kind: Rule
     services:
-    - name: {{ .Values.service.name }}
+    - name: {{ .Values.service.name }}-service
       port: {{ .Values.service.targetport }}
   tls:
     secretName: {{ .Values.ingress.tls }}
diff --git a/charts/durpapi/templates/service.yaml b/charts/durpapi/templates/service.yaml
index d7d05a2..ad3ef88 100644
--- a/charts/durpapi/templates/service.yaml
+++ b/charts/durpapi/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ .Chart.Name }}-service
 spec:
   ports:
   - name: http
diff --git a/charts/durpapi/values.yaml b/charts/durpapi/values.yaml
index 861eb25..35439d1 100644
--- a/charts/durpapi/values.yaml
+++ b/charts/durpapi/values.yaml
@@ -1,7 +1,7 @@
 deployment: 
   replicas: 1
   image: registry.gitlab.com/developerdurp/durpapi
-  tag: latest
+  tag: ""
   imagePullPolicy: Always
   secretfile: durpapi-secret
 
@@ -11,7 +11,6 @@ ingress:
   tls: durpapi-tls
 
 service:
-  name: durpapi
   type: ClusterIP
   port: 8080
   targetport: 80
\ No newline at end of file